* packages/gnorb/gnorb.el: Mention dependency on cl-lib.

[gnu-emacs-elpa] / packages / gnorb / gnorb-gnus.el

diff --git a/packages/gnorb/gnorb-gnus.el b/packages/gnorb/gnorb-gnus.el
index ba72107f93261269609941bbc7c882a12c08753e..75da114636c0ce5917ea956d77a1463c1dfe191c 100644 (file)
--- a/packages/gnorb/gnorb-gnus.el
+++ b/packages/gnorb/gnorb-gnus.el
@@ -1,6 +1,6 @@
 ;;; gnorb-gnus.el --- The gnus-centric fuctions of gnorb
 
-;; Copyright (C) 2014  Eric Abrahamsen
+;; Copyright (C) 2014  Free Software Foundation, Inc.
 
 ;; Author: Eric Abrahamsen <eric@ericabrahamsen.net>
 ;; Keywords: 
@@ -247,7 +247,9 @@ save them into `gnorb-tmp-dir'."
 (defun gnorb-gnus-capture-abort-cleanup ()
   (when (and org-note-abort
             (org-capture-get :gnus-attachments))
-    (condition-case error
+    ;; FIXME: Yuck: setting `abort-note' will fail as soon as org-capture.el is
+    ;; compiled with lexical-binding!
+    (condition-case nil
        (progn (org-attach-delete-all)
               (setq abort-note 'clean)
               ;; remove any gnorb-mail-header values here
@@ -433,6 +435,8 @@ work."
           "Message will trigger TODO state-changes after sending"
         "A TODO will be made from this message after it's sent")))))
 
+(defvar org-capture-link-is-already-stored)
+
 (defun gnorb-gnus-outgoing-make-todo-1 ()
   (unless gnorb-gnus-new-todo-capture-key
     (error "No capture template key set, customize gnorb-gnus-new-todo-capture-key"))