mail merge improvements

2 files changed, 19 insertions, 1 deletions

diff --git a/emacsconf-mail.el b/emacsconf-mail.el
index 21e22e9..c31e049 100644
--- a/emacsconf-mail.el
+++ b/emacsconf-mail.el
@@ -230,7 +230,8 @@ Include some other things, too, such as emacsconf-year, title, name, email, url,
   (interactive)
   (mapc (lambda (buffer)
           (when (string-match "unsent" (buffer-name buffer))
-            (let ((kill-buffer-query-functions nil))
+            (let ((kill-buffer-query-functions nil)
+                  (buffer-modified-p nil))
               (set-buffer-modified-p nil)
               (kill-buffer buffer))))
         (buffer-list)))
diff --git a/emacsconf.el b/emacsconf.el
index 36d21b2..855e2f8 100644
--- a/emacsconf.el
+++ b/emacsconf.el
@@ -1250,9 +1250,26 @@ tracks with the ID in the cdr of that list."
     (if do-insert (insert result))
     result))
 
+(defun emacsconf-add-to-logbook (note)
+  "Add NOTE as a logbook entry for the current subtree."
+  (move-marker org-log-note-return-to (point))
+  (move-marker org-log-note-marker (point))
+  (with-temp-buffer
+    (insert note)
+    (let ((org-log-note-purpose 'note))
+      (org-store-log-note))))
+
+(defun emacsconf-add-to-talk-logbook (talk note)
+  "Add NOTE as a logbook entry for TALK."
+  (interactive (list (emacsconf-complete-talk) (read-string "Note: ")))
+  (save-excursion
+    (emacsconf-with-talk-heading talk
+      (emacsconf-add-to-logbook note))))
+
 (defun emacsconf-reload ()
   "Reload the emacsconf-el modules."
   (interactive)
   (mapc #'load-library '("emacsconf" "emacsconf-erc" "emacsconf-publish" "emacsconf-stream" "emacsconf-pad")))
+
 (provide 'emacsconf)
 ;;; emacsconf.el ends here