summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-07-04 01:10:03 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-07-04 01:11:57 +0200
commita3d02c49a052d0dfa2c5fc8e6a3641b5bc06f7d0 (patch)
tree25d88bdb23ccb3199521afe389eeb0509929170a
parentcc5a9bf538a4a7eb1b84d368336c46cead106e01 (diff)
downloadorg-mode-a3d02c49a052d0dfa2c5fc8e6a3641b5bc06f7d0.tar.gz
Do not cancel note when `org-add-log-note' is called with a prefix argument
* lisp/org.el (org-add-log-note): (org-store-log-note): Ignore prefix argument. The behaviour is undocumented and can lead to data loss. Reported-by: Kyle Meyer <kyle@kyleam.com> <http://lists.gnu.org/archive/html/emacs-orgmode/2017-07/msg00024.html>
-rw-r--r--lisp/org.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index da8df99..bc4171d 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -13738,7 +13738,7 @@ EXTRA is additional text that will be inserted into the notes buffer."
(org-switch-to-buffer-other-window "*Org Note*")
(erase-buffer)
(if (memq org-log-note-how '(time state))
- (let (current-prefix-arg) (org-store-log-note))
+ (org-store-log-note)
(let ((org-inhibit-startup t)) (org-mode))
(insert (format "# Insert note for %s.
# Finish with C-c C-c, or cancel with C-c C-k.\n\n"
@@ -13815,7 +13815,7 @@ EXTRA is additional text that will be inserted into the notes buffer."
org-log-note-previous-state)))))))
(when lines (setq note (concat note " \\\\")))
(push note lines))
- (when (and lines (not (or current-prefix-arg org-note-abort)))
+ (when (and lines (not org-note-abort))
(with-current-buffer (marker-buffer org-log-note-marker)
(org-with-wide-buffer
;; Find location for the new note.