ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-12-30 01:21:32 +01:00
parent b5f93f8fe3 14c3635a0d
commit 460c4d4ed0
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org-macs.el
View File

@ -126,6 +126,15 @@ Also, do not record undo information."
(org-move-to-column ,col))))) (org-move-to-column ,col)))))
(def-edebug-spec org-preserve-lc (body)) (def-edebug-spec org-preserve-lc (body))
;; Copied from bookmark.el
(defmacro org-with-buffer-modified-unmodified (&rest body)
"Run BODY while preserving the buffer's `buffer-modified-p' state."
(org-with-gensyms (was-modified)
`(let ((,was-modified (buffer-modified-p)))
(unwind-protect
(progn ,@body)
(set-buffer-modified-p ,was-modified)))))
(defmacro org-without-partial-completion (&rest body) (defmacro org-without-partial-completion (&rest body)
`(if (and (boundp 'partial-completion-mode) `(if (and (boundp 'partial-completion-mode)
partial-completion-mode partial-completion-mode

2
lisp/org.el
View File

@ -12008,7 +12008,7 @@ changes because there are unchecked boxes in this entry."
(defun org-entry-blocked-p () (defun org-entry-blocked-p ()
"Is the current entry blocked?" "Is the current entry blocked?"
(with-buffer-modified-unmodified (org-with-buffer-modified-unmodified
(if (org-entry-get nil "NOBLOCKING") (if (org-entry-get nil "NOBLOCKING")
nil ;; Never block this entry nil ;; Never block this entry
(not (not