diff options
author | Bastien Guerry <bzg@altern.org> | 2012-12-31 09:30:19 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-12-31 09:30:19 +0100 |
commit | 6a758e26fff9f0f533eda18677b0297717f57087 (patch) | |
tree | 9d986af2597958fffa26c055153ea7f0ed265c19 | |
parent | 839c8cdd148ec144079199ec4714c57d493a7e0e (diff) | |
parent | a62beff06dedc8075b0753ace670a26102d224ba (diff) | |
download | org-mode-6a758e26fff9f0f533eda18677b0297717f57087.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-agenda.el | 4 | ||||
-rw-r--r-- | lisp/org.el | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 4d3e602..9b911f6 100644 --- a/lisp/org-agenda.el +++ b/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." diff --git a/lisp/org.el b/lisp/org.el index 0549c79..22a526c 100644 --- a/lisp/org.el +++ b/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. |