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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-07-04 01:13:03 +02:00
parent a20c17fa51 a3d02c49a0
commit 8c548b81b9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org.el
View File

@ -13601,7 +13601,7 @@ EXTRA is additional text that will be inserted into the notes buffer."
(org-switch-to-buffer-other-window "*Org Note*") (org-switch-to-buffer-other-window "*Org Note*")
(erase-buffer) (erase-buffer)
(if (memq org-log-note-how '(time state)) (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)) (let ((org-inhibit-startup t)) (org-mode))
(insert (format "# Insert note for %s. (insert (format "# Insert note for %s.
# Finish with C-c C-c, or cancel with C-c C-k.\n\n" # Finish with C-c C-c, or cancel with C-c C-k.\n\n"
@ -13678,7 +13678,7 @@ EXTRA is additional text that will be inserted into the notes buffer."
org-log-note-previous-state))))))) org-log-note-previous-state)))))))
(when lines (setq note (concat note " \\\\"))) (when lines (setq note (concat note " \\\\")))
(push note lines)) (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) (with-current-buffer (marker-buffer org-log-note-marker)
(org-with-wide-buffer (org-with-wide-buffer
;; Find location for the new note. ;; Find location for the new note.