Browse Source

Merge branch 'maint'

Bastien Guerry 5 years ago
parent
commit
6a758e26ff
2 changed files with 7 additions and 4 deletions
  1. 2 2
      lisp/org-agenda.el
  2. 5 2
      lisp/org.el

+ 2 - 2
lisp/org-agenda.el

@@ -8000,7 +8000,7 @@ It also looks at the text of the entry itself."
 	 (lkend (cdr lkall))
 	 trg)
     (cond
-     (buffer
+     ((and buffer (stringp lk))
       (with-current-buffer buffer
 	(setq trg (and (string-match org-bracket-link-regexp lk)
 		       (match-string 1 lk)))
@@ -8024,7 +8024,7 @@ It also looks at the text of the entry itself."
 	    (beginning-of-line 1)
 	    (looking-at (concat ".*?\\(" org-bracket-link-regexp "\\)"))))
       (org-open-link-from-string (match-string 1)))
-     (t (error "No link to open here")))))
+     (t (message "No link to open here")))))
 
 (defun org-agenda-copy-local-variable (var)
   "Get a variable from a referenced buffer and install it here."

+ 5 - 2
lisp/org.el

@@ -19528,8 +19528,10 @@ This command does many different things, depending on context:
 	  (org-list-struct-fix-ind struct parents)
 	  (setq block-item
 		(org-list-struct-fix-box struct parents prevs orderedp)))
-	(org-list-struct-apply-struct struct old-struct)
-	(org-update-checkbox-count-maybe)
+	(if (equal struct old-struct)
+	    (user-error "Cannot toggle this checkbox (unchecked subitems?)")
+	  (org-list-struct-apply-struct struct old-struct)
+	  (org-update-checkbox-count-maybe))
 	(when block-item
 	  (message
 	   "Checkboxes were removed due to unchecked box at line %d"
@@ -21349,6 +21351,7 @@ function installs the following ones: \"property\",
        (t
 	(beginning-of-line 0)
 	(while (and (not (bobp))
+		    (not (looking-at org-table-line-regexp))
 		    (not (looking-at org-drawer-regexp))
 		    ;; When point started in an inline task, do not move
 		    ;; above task starting line.