branch: externals/gnorb
commit 94fe1b830c10a286f20ba6613b3e57bb7f7e6a49
Author: Eric Abrahamsen <[email protected]>
Commit: Eric Abrahamsen <[email protected]>
Incorporate changes from Stefan M
* gnorb-bbdb.el: Be a little more careful about how BBDB is initiated --
allow successful compilation/loading even if it is not present.
* gnorb-gnus.el
* gnorb-org.el
* gnorb-registry.el
* gnorb-utils.el: Need to require mailcap, also delete unused vestigial
code.
* gnorb.el
* nngnorb.el
Otherwise, use (require 'cl-lib) where necessary, and make sure all
relevant functions are prefixed with "cl-". Change copyright ownership
notices from myself to the FSF.
---
gnorb-bbdb.el | 10 ++++++----
gnorb-gnus.el | 2 +-
gnorb-org.el | 5 +++--
gnorb-registry.el | 2 +-
gnorb-utils.el | 6 +++---
gnorb.el | 2 +-
nngnorb.el | 2 +-
7 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/gnorb-bbdb.el b/gnorb-bbdb.el
index f774a5f..e95463e 100644
--- a/gnorb-bbdb.el
+++ b/gnorb-bbdb.el
@@ -1,6 +1,6 @@
;;; gnorb-bbdb.el --- The BBDB-centric functions of gnorb
-;; Copyright (C) 2014 Eric Abrahamsen
+;; Copyright (C) 2014 Free Software Foundation, Inc.
;; Author: Eric Abrahamsen <[email protected]>
;; Keywords:
@@ -24,8 +24,9 @@
;;; Code:
-(require 'bbdb)
+(require 'bbdb nil t)
(require 'gnorb-utils)
+(require 'cl-lib)
(defgroup gnorb-bbdb nil
"The BBDB bits of gnorb."
@@ -37,8 +38,9 @@
:group 'gnorb-bbdb
:type 'symbol)
-(unless (assoc gnorb-bbdb-org-tag-field bbdb-separator-alist)
- (push `(,gnorb-bbdb-org-tag-field ":" ":") bbdb-separator-alist))
+(when (boundp 'bbdb-separator-alist) ;Allow compilation if BBDB is absent!
+ (unless (assoc gnorb-bbdb-org-tag-field bbdb-separator-alist)
+ (push `(,gnorb-bbdb-org-tag-field ":" ":") bbdb-separator-alist)))
(defcustom gnorb-bbdb-messages-field 'messages
"The name (as a symbol) of the field where links to recent gnus
diff --git a/gnorb-gnus.el b/gnorb-gnus.el
index 2a9c869..2380514 100644
--- a/gnorb-gnus.el
+++ b/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 <[email protected]>
;; Keywords:
diff --git a/gnorb-org.el b/gnorb-org.el
index ed4d7a9..39fc7c1 100644
--- a/gnorb-org.el
+++ b/gnorb-org.el
@@ -1,6 +1,6 @@
;;; gnorb-org.el --- The Org-centric functions of gnorb
-;; Copyright (C) 2014 Eric Abrahamsen
+;; Copyright (C) 2014 Free Software Foundation, Inc.
;; Author: Eric Abrahamsen <[email protected]>
;; Keywords:
@@ -25,6 +25,7 @@
;;; Code:
(require 'gnorb-utils)
+(require 'cl-lib)
(defgroup gnorb-org nil
"The Org bits of Gnorb."
@@ -514,7 +515,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/gnorb-registry.el b/gnorb-registry.el
index f72262e..5e9bb20 100644
--- a/gnorb-registry.el
+++ b/gnorb-registry.el
@@ -1,6 +1,6 @@
;;; gnorb-registry.el --- Registry implementation for Gnorb
-;; This file is in the public domain.
+;; Copyright (C) 2014 Free Software Foundation, Inc.
;; Author: Eric Abrahamsen <[email protected].>
diff --git a/gnorb-utils.el b/gnorb-utils.el
index 7e00f0d..424e7c5 100644
--- a/gnorb-utils.el
+++ b/gnorb-utils.el
@@ -1,6 +1,6 @@
;;; gnorb-utils.el --- Common utilities for all gnorb stuff.
-;; Copyright (C) 2014 Eric Abrahamsen
+;; Copyright (C) 2014 Free Software Foundation, Inc.
;; Author: Eric Abrahamsen <[email protected]>
;; Keywords:
@@ -26,6 +26,7 @@
(require 'cl-lib)
+(require 'mailcap)
(mailcap-parse-mimetypes)
(defgroup gnorb nil
@@ -365,8 +366,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.
diff --git a/gnorb.el b/gnorb.el
index 5bee2dc..ff94dee 100644
--- a/gnorb.el
+++ b/gnorb.el
@@ -1,6 +1,6 @@
;;; gnorb.el --- Glue code between Gnus, Org, and BBDB
-;; Copyright (C) 2014 Eric Abrahamsen
+;; Copyright (C) 2014 Free Software Foundation, Inc.
;; Version: 1.0.1
diff --git a/nngnorb.el b/nngnorb.el
index 320d390..907fe36 100644
--- a/nngnorb.el
+++ b/nngnorb.el
@@ -1,6 +1,6 @@
;;; nngnorb.el --- Gnorb backend for Gnus
-;; This file is in the public domain.
+;; Copyright (C) 2014 Free Software Foundation, Inc.
;; Author: Eric Abrahamsen <[email protected].>
