* packages/gnorb: Don't require cl. Fix up compilation errors.

* packages/gnorb/gnorb-bbdb.el: Don't require cl unnecessarily.
Don't fail compilation just because bbdb is not available yet.
(gnorb-bbdb-tag-agenda): Fix typo.
* packages/gnorb/gnorb-gnus.el: Don't require cl unnecessarily.
(gnorb-gnus-view): Fix var binding.
* packages/gnorb/gnorb-org.el: Don't require cl unnecessarily.
* packages/gnorb/gnorb-utils.el: Don't require cl unnecessarily.
But do require mailcap.
(gnorb-msg-id-to-group): Remove dead code.

diff --git a/packages/gnorb/gnorb-bbdb.el b/packages/gnorb/gnorb-bbdb.el
index 66be7938db83a5ee8d9e2a7cafa036d465c451a6..572a4b92729f61be852aa236973ef6ff425f20a2 100644 (file)
--- a/packages/gnorb/gnorb-bbdb.el
+++ b/packages/gnorb/gnorb-bbdb.el
@@ -24,10 +24,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
-(require 'bbdb)
+(require 'bbdb nil t)
 (require 'gnorb-utils)
 (require 'cl-lib)
 
@@ -397,13 +394,13 @@ both, use \"C-u\" before the \"*\"."
          (delete-dups
           (cl-mapcan (lambda (r)
                     (bbdb-record-xfield-split r gnorb-bbdb-org-tag-field))
-                  records)))
+                  records))
          "|")))
     (if tag-string
        ;; C-u = all headings, not just todos
        (org-tags-view (not (equal current-prefix-arg '(4)))
                        tag-string)
-      (error "No org-tags field present")))
+      (error "No org-tags field present"))))
 
 ;;;###autoload
 (defun gnorb-bbdb-mail-search (records)

diff --git a/packages/gnorb/gnorb-gnus.el b/packages/gnorb/gnorb-gnus.el
index e65067773fbf3c720cfdc2900219d23ad79a7f9b..2d3c5b09cc4a56a2c88c670abb6c6e46cf857efa 100644 (file)
--- a/packages/gnorb/gnorb-gnus.el
+++ b/packages/gnorb/gnorb-gnus.el
@@ -24,9 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
 (require 'gnus)
 (require 'gnorb-utils)
 
@@ -669,11 +666,11 @@ option `gnorb-gnus-hint-relevant-article' is non-nil."
 (defun gnorb-gnus-view ()
   "Display the first relevant TODO heading for the message under point"
   (interactive)
-  (let ((headers (gnus-data-header
+  (let* ((headers (gnus-data-header
                   (gnus-data-find
                    (gnus-summary-article-number))))
-       (tracked-headings
-        (gnorb-find-tracked-headings headers)))
+         (tracked-headings
+          (gnorb-find-tracked-headings headers)))
     (when tracked-headings
       (setq gnorb-window-conf (current-window-configuration))
       (move-marker gnorb-return-marker (point))

diff --git a/packages/gnorb/gnorb-org.el b/packages/gnorb/gnorb-org.el
index 8ac25036781de9911bf52a9df81b055a589b42e5..6d3772d74b19c1c9a256e298ea81e244278057ed 100644 (file)
--- a/packages/gnorb/gnorb-org.el
+++ b/packages/gnorb/gnorb-org.el
@@ -24,9 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
 (require 'gnorb-utils)
 (require 'cl-lib)
 
@@ -525,7 +522,7 @@ default set of parameters."
            (apply 'org-export-to-file
                   `(,backend-symbol
                     ,(org-export-output-file-name
-                      (second (assoc backend-symbol gnorb-org-export-extensions))
+                      (cl-second (assoc backend-symbol gnorb-org-export-extensions))
                       t gnorb-tmp-dir)
                     ,@opts
                     ,gnorb-org-email-subtree-file-parameters))))

diff --git a/packages/gnorb/gnorb-utils.el b/packages/gnorb/gnorb-utils.el
index c132a68ef1c58b9f5bcd5035c2c46f5efc3221e7..29185a17b7b968b65d56371300de8aea61e48eaa 100644 (file)
--- a/packages/gnorb/gnorb-utils.el
+++ b/packages/gnorb/gnorb-utils.el
@@ -24,9 +24,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
+(require 'mailcap)
 (mailcap-parse-mimetypes)
 
 (defgroup gnorb nil
@@ -364,8 +362,7 @@ methods?"
                     (ignore-errors
                       (gnus-request-head msg-id server-group)))
                (throw 'found server-group))))
-      (when (featurep 'notmuch)
-       nil))))
+      nil)))
 
 (defun gnorb-collect-ids (&optional id)
   "Collect all Org IDs for a subtree.