Merge branch 'maint'

lisp/org-macs.el

@@ -126,6 +126,15 @@ Also, do not record undo information."
 	 (org-move-to-column ,col)))))
 (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)
   `(if (and (boundp 'partial-completion-mode)
 	    partial-completion-mode

lisp/org.el

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