From 7fa187c754ab333e7ac4696e1c10fd40610a53d1 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 26 Nov 2014 11:15:33 -0500
Subject: [PATCH] * 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.
---
 packages/gnorb/gnorb-bbdb.el  | 9 +++------
 packages/gnorb/gnorb-gnus.el  | 9 +++------
 packages/gnorb/gnorb-org.el   | 5 +----
 packages/gnorb/gnorb-utils.el | 7 ++-----
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/packages/gnorb/gnorb-bbdb.el b/packages/gnorb/gnorb-bbdb.el
index 66be7938d..572a4b927 100644
--- 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 e65067773..2d3c5b09c 100644
--- 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 8ac250367..6d3772d74 100644
--- 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 c132a68ef..29185a17b 100644
--- 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.
-- 
2.39.2