Merge commit '3659f0267f1a70a7141b7d53d8a0696d40247c08'

[gnu-emacs-elpa] / packages / excorporate / excorporate-org.el

diff --git a/packages/excorporate/excorporate-org.el b/packages/excorporate/excorporate-org.el
index 8613f8e9c081ec7817597781303ffac73e9499c3..a06057a13f9fa14f72b4174bde21ca8b3a81224a 100644 (file)
--- a/packages/excorporate/excorporate-org.el
+++ b/packages/excorporate/excorporate-org.el
@@ -35,6 +35,8 @@
   (with-current-buffer (get-buffer-create excorporate-org-buffer-name)
       (setq buffer-read-only t)
       (org-mode)
+      (use-local-map (copy-keymap org-mode-map))
+      (local-set-key "q" 'quit-window)
       (display-buffer (current-buffer))
       (let ((inhibit-read-only t))
        (delete-region (point-min) (point-max))
@@ -88,8 +90,9 @@ are the requested participants."
   (insert (format "+ Duration: %d minutes\n"
                  (round (/ (float-time (time-subtract end start)) 60.0))))
   (insert (format "+ Location: %s\n" location))
-  (insert "+ Invitees:\n")
-  (exco-org-insert-invitees main-invitees)
+  (when main-invitees
+    (insert "+ Invitees:\n")
+    (exco-org-insert-invitees main-invitees))
   (when optional-invitees
     (insert "+ Optional invitees:\n")
     (exco-org-insert-invitees optional-invitees)))