org-store-log-note: access org-log-note-headings in org buffer

This change allows org-mode to respect a buffer-local value of
org-log-note-headings, by accessing its value in the org buffer
instead of in the "*Org Note*" buffer.
This commit is contained in:
John Foerch 2012-11-20 15:25:04 -05:00 committed by Nicolas Goaziou
parent 6c8bd67cae
commit a3490b140d
1 changed files with 4 additions and 4 deletions

View File

@ -12732,10 +12732,10 @@ EXTRA is additional text that will be inserted into the notes buffer."
(defvar org-note-abort nil) ; dynamically scoped (defvar org-note-abort nil) ; dynamically scoped
(defun org-store-log-note () (defun org-store-log-note ()
"Finish taking a log note, and insert it to where it belongs." "Finish taking a log note, and insert it to where it belongs."
(let ((txt (buffer-string)) (let ((txt (buffer-string)))
(note (cdr (assq org-log-note-purpose org-log-note-headings)))
lines ind bul)
(kill-buffer (current-buffer)) (kill-buffer (current-buffer))
(let ((note (cdr (assq org-log-note-purpose org-log-note-headings)))
lines ind bul)
(while (string-match "\\`# .*\n[ \t\n]*" txt) (while (string-match "\\`# .*\n[ \t\n]*" txt)
(setq txt (replace-match "" t t txt))) (setq txt (replace-match "" t t txt)))
(if (string-match "\\s-+\\'" txt) (if (string-match "\\s-+\\'" txt)
@ -12802,7 +12802,7 @@ EXTRA is additional text that will be inserted into the notes buffer."
(insert (pop lines)))) (insert (pop lines))))
(message "Note stored") (message "Note stored")
(org-back-to-heading t) (org-back-to-heading t)
(org-cycle-hide-drawers 'children))))) (org-cycle-hide-drawers 'children))))))
(set-window-configuration org-log-note-window-configuration) (set-window-configuration org-log-note-window-configuration)
(with-current-buffer (marker-buffer org-log-note-return-to) (with-current-buffer (marker-buffer org-log-note-return-to)
(goto-char org-log-note-return-to)) (goto-char org-log-note-return-to))