branch: externals/gnorb
commit 86fa8937eb2cb3f6f4e382f176826e6b99a4d2f3
Author: Eric Abrahamsen <[email protected]>
Commit: Eric Abrahamsen <[email protected]>
Fix up all cl-lib calls
* gnorb.el: Add Package-Requires header for cl-lib.
* gnorb-registry.el: Require cl-lib and use its names.
* gnorb-bbdb.el: Use cl-lib names.
---
gnorb-bbdb.el | 8 ++++----
gnorb-registry.el | 7 ++++---
gnorb.el | 1 +
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/gnorb-bbdb.el b/gnorb-bbdb.el
index bf5bd03..2785e12 100644
--- a/gnorb-bbdb.el
+++ b/gnorb-bbdb.el
@@ -107,7 +107,7 @@ mentioned in the docstring of `format-time-string', which
see."
Defaults to org-link."
:group 'gnorb-bbdb)
-(defstruct gnorb-bbdb-link
+(cl-defstruct gnorb-bbdb-link
subject date group id)
(defcustom gnorb-bbdb-posting-styles nil
@@ -419,14 +419,14 @@ a prefix arg and \"*\", the prefix arg must come first."
gnorb-gnus-mail-search-backends)
(error "No search backend specified")))
(search-string
- (funcall (second backend)
+ (funcall (cl-second backend)
(cl-mapcan 'bbdb-record-mail records))))
(when (equal current-prefix-arg '(4))
(setq search-string
(read-from-minibuffer
(format "%s search string: " (first backend)) search-string)))
- (funcall (third backend) search-string)
- (delete-other-windows)))
+ (funcall (cl-third backend) search-string)
+ (delete-other-windows)))
;;;###autoload
(defun gnorb-bbdb-cite-contact (rec)
diff --git a/gnorb-registry.el b/gnorb-registry.el
index 71e86cf..bcd5adc 100644
--- a/gnorb-registry.el
+++ b/gnorb-registry.el
@@ -50,6 +50,7 @@
(require 'gnus-registry)
(require 'gnorb-utils)
+(require 'cl-lib)
(defgroup gnorb-registry nil
"Gnorb's use of the Gnus registry."
@@ -287,8 +288,8 @@ your Org files."
'gnus))
(dolist (l (plist-get links :gnus))
(gnorb-registry-make-entry
- (second (split-string l "#")) nil nil
- id (first (split-string l "#"))))
+ (cl-second (split-string l "#")) nil nil
+ id (cl-first (split-string l "#"))))
(dolist (p props)
(setq id )
(gnorb-registry-make-entry p nil nil id nil)
@@ -297,7 +298,7 @@ your Org files."
;; it.
(unless (gnus-registry-get-id-key p 'group)
(gnorb-msg-id-to-group p))
- (incf count)))))
+ (cl-incf count)))))
gnorb-org-find-candidates-match
'agenda 'archive 'comment)
(message "Collecting all relevant Org headings, this could take a while...
done")
diff --git a/gnorb.el b/gnorb.el
index ff94dee..6dd4b0b 100644
--- a/gnorb.el
+++ b/gnorb.el
@@ -3,6 +3,7 @@
;; Copyright (C) 2014 Free Software Foundation, Inc.
;; Version: 1.0.1
+;; Package-Requires: ((cl-lib "0.5"))
;; Maintainer: Eric Abrahamsen <[email protected]>
