[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ebdb ed92ace 1/2: Various cosmetic changes
|
From: |
Eric Abrahamsen |
|
Subject: |
[elpa] externals/ebdb ed92ace 1/2: Various cosmetic changes |
|
Date: |
Tue, 13 Jul 2021 16:40:12 -0400 (EDT) |
branch: externals/ebdb
commit ed92ace45b95557305eccf9291c315373e4a5084
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Eric Abrahamsen <eric@ericabrahamsen.net>
Various cosmetic changes
* ebdb.el:
Simplify `Package-Requires` since `cl-lib` is included in Emacsā„24.3.
Remove redundant `:group` arguments.
Don't rely on the CLOS-incompatible semantics of EIEIO's `:initform`.
Prefer #' to quote function names.
---
ebdb-com.el | 205 +++++++++++++++++++++++++++++----------------------------
ebdb-format.el | 4 +-
ebdb-mhe.el | 2 +-
ebdb-mua.el | 26 ++------
ebdb-org.el | 4 +-
ebdb-pgp.el | 8 +--
ebdb-vcard.el | 6 +-
ebdb.el | 50 +++++++-------
8 files changed, 142 insertions(+), 163 deletions(-)
diff --git a/ebdb-com.el b/ebdb-com.el
index 5aa7807..f5214d3 100644
--- a/ebdb-com.el
+++ b/ebdb-com.el
@@ -1,6 +1,6 @@
;;; ebdb-com.el --- User-level commands of EBDB -*- lexical-binding: t;
-*-
-;; Copyright (C) 2016-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
;; Author: Eric Abrahamsen <eric@ericabrahamsen.net>
;; Keywords: convenience, mail
@@ -39,7 +39,7 @@
(defvar ebdb-crm-local-completion-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map crm-local-completion-map)
- (define-key map " " 'self-insert-command)
+ (define-key map " " #'self-insert-command)
map)
"Keymap used for EBDB crm completions.")
@@ -262,101 +262,101 @@ display information."
(let* ((marked (seq-filter (lambda (r) (nth 3 r)) ebdb-records))
(recs (or marked (list (ebdb-current-record t)))))
(setq recs (seq-filter (lambda (r) (eieio-object-p (car r))) recs))
- (if full recs (mapcar 'car recs))))
+ (if full recs (mapcar #'car recs))))
;;; Keymap
(defvar ebdb-mode-map
(let ((km (make-sparse-keymap)))
- (define-key km (kbd "!") 'ebdb-search-invert)
- (define-key km (kbd "RET") 'ebdb-record-action)
- (define-key km (kbd "A") 'ebdb-mail-aliases)
- (define-key km (kbd "c") 'ebdb-create-record)
- (define-key km (kbd "C") 'ebdb-create-record-extended)
- (define-key km (kbd "R") 'ebdb-create-record-and-role)
- (define-key km (kbd "e") 'ebdb-edit-field)
- (define-key km (kbd "E") 'ebdb-edit-field-customize)
- (define-key km (kbd ";") 'ebdb-edit-foo)
- (define-key km (kbd "n") 'ebdb-next-record)
- (define-key km (kbd "p") 'ebdb-prev-record)
- (define-key km (kbd "N") 'ebdb-next-field)
- (define-key km (kbd "TAB") 'ebdb-next-field)
- (define-key km (kbd "P") 'ebdb-prev-field)
- (define-key km (kbd "<backtab>") 'ebdb-prev-field)
+ (define-key km (kbd "!") #'ebdb-search-invert)
+ (define-key km (kbd "RET") #'ebdb-record-action)
+ (define-key km (kbd "A") #'ebdb-mail-aliases)
+ (define-key km (kbd "c") #'ebdb-create-record)
+ (define-key km (kbd "C") #'ebdb-create-record-extended)
+ (define-key km (kbd "R") #'ebdb-create-record-and-role)
+ (define-key km (kbd "e") #'ebdb-edit-field)
+ (define-key km (kbd "E") #'ebdb-edit-field-customize)
+ (define-key km (kbd ";") #'ebdb-edit-foo)
+ (define-key km (kbd "n") #'ebdb-next-record)
+ (define-key km (kbd "p") #'ebdb-prev-record)
+ (define-key km (kbd "N") #'ebdb-next-field)
+ (define-key km (kbd "TAB") #'ebdb-next-field)
+ (define-key km (kbd "P") #'ebdb-prev-field)
+ (define-key km (kbd "<backtab>") #'ebdb-prev-field)
;; Database-related commands
- (define-key km (kbd "d c") 'ebdb-copy-records)
- (define-key km (kbd "d m") 'ebdb-move-records)
- (define-key km (kbd "d e") 'ebdb-customize-database)
- (define-key km (kbd "d r") 'ebdb-reload-database)
- (define-key km (kbd "d d") 'ebdb-disable-database)
-
- (define-key km (kbd "r") 'ebdb-reformat-records)
- (define-key km (kbd "f") 'ebdb-format-to-tmp-buffer)
- (define-key km (kbd "F") 'ebdb-format-these-records)
- (define-key km (kbd "I") 'ebdb-cite-records-ebdb)
- (define-key km (kbd "C-k") 'ebdb-delete-field-or-record)
- (define-key km (kbd "i") 'ebdb-insert-field)
- (define-key km (kbd "s") 'ebdb-save-ebdb)
- (define-key km (kbd "C-x C-s") 'ebdb-save-ebdb)
- (define-key km (kbd "t") 'ebdb-toggle-records-format)
- (define-key km (kbd "T") 'ebdb-toggle-all-records-format)
+ (define-key km (kbd "d c") #'ebdb-copy-records)
+ (define-key km (kbd "d m") #'ebdb-move-records)
+ (define-key km (kbd "d e") #'ebdb-customize-database)
+ (define-key km (kbd "d r") #'ebdb-reload-database)
+ (define-key km (kbd "d d") #'ebdb-disable-database)
+
+ (define-key km (kbd "r") #'ebdb-reformat-records)
+ (define-key km (kbd "f") #'ebdb-format-to-tmp-buffer)
+ (define-key km (kbd "F") #'ebdb-format-these-records)
+ (define-key km (kbd "I") #'ebdb-cite-records-ebdb)
+ (define-key km (kbd "C-k") #'ebdb-delete-field-or-record)
+ (define-key km (kbd "i") #'ebdb-insert-field)
+ (define-key km (kbd "s") #'ebdb-save-ebdb)
+ (define-key km (kbd "C-x C-s") #'ebdb-save-ebdb)
+ (define-key km (kbd "t") #'ebdb-toggle-records-format)
+ (define-key km (kbd "T") #'ebdb-toggle-all-records-format)
;; Marking
- (define-key km (kbd "#") 'ebdb-toggle-record-mark)
- (define-key km (kbd "M-#") 'ebdb-toggle-all-record-marks)
- (define-key km (kbd "C-#") 'ebdb-unmark-all-records)
-
- (define-key km (kbd "o") 'ebdb-omit-records)
- (define-key km (kbd "m") 'ebdb-mail)
- (define-key km (kbd "M") 'ebdb-mail-each)
- (define-key km (kbd "M-d") 'ebdb-dial)
- (define-key km (kbd "h") 'ebdb-info)
- (define-key km (kbd "?") 'ebdb-help)
+ (define-key km (kbd "#") #'ebdb-toggle-record-mark)
+ (define-key km (kbd "M-#") #'ebdb-toggle-all-record-marks)
+ (define-key km (kbd "C-#") #'ebdb-unmark-all-records)
+
+ (define-key km (kbd "o") #'ebdb-omit-records)
+ (define-key km (kbd "m") #'ebdb-mail)
+ (define-key km (kbd "M") #'ebdb-mail-each)
+ (define-key km (kbd "M-d") #'ebdb-dial)
+ (define-key km (kbd "h") #'ebdb-info)
+ (define-key km (kbd "?") #'ebdb-help)
;; Copying data
- (define-key km (kbd "w r") 'ebdb-copy-records-as-kill)
- (define-key km (kbd "w f") 'ebdb-copy-fields-as-kill)
- (define-key km (kbd "w m") 'ebdb-copy-mail-as-kill)
- (define-key km (kbd "=") 'delete-other-windows)
+ (define-key km (kbd "w r") #'ebdb-copy-records-as-kill)
+ (define-key km (kbd "w f") #'ebdb-copy-fields-as-kill)
+ (define-key km (kbd "w m") #'ebdb-copy-mail-as-kill)
+ (define-key km (kbd "=") #'delete-other-windows)
;; Buffer manipulation
- (define-key km (kbd "b c") 'ebdb-clone-buffer)
- (define-key km (kbd "b r") 'ebdb-rename-buffer)
+ (define-key km (kbd "b c") #'ebdb-clone-buffer)
+ (define-key km (kbd "b r") #'ebdb-rename-buffer)
;; Search keys
- (define-key km (kbd "/ /") 'ebdb)
- (define-key km (kbd "/ 1") 'ebdb-search-single-record)
- (define-key km (kbd "/ n") 'ebdb-search-name)
- (define-key km (kbd "| n") 'ebdb-search-name)
- (define-key km (kbd "+ n") 'ebdb-search-name)
- (define-key km (kbd "/ o") 'ebdb-search-organization)
- (define-key km (kbd "| o") 'ebdb-search-organization)
- (define-key km (kbd "+ o") 'ebdb-search-organization)
- (define-key km (kbd "/ p") 'ebdb-search-phone)
- (define-key km (kbd "| p") 'ebdb-search-phone)
- (define-key km (kbd "+ p") 'ebdb-search-phone)
- (define-key km (kbd "/ a") 'ebdb-search-address)
- (define-key km (kbd "| a") 'ebdb-search-address)
- (define-key km (kbd "+ a") 'ebdb-search-address)
- (define-key km (kbd "/ m") 'ebdb-search-mail)
- (define-key km (kbd "| m") 'ebdb-search-mail)
- (define-key km (kbd "+ m") 'ebdb-search-mail)
- (define-key km (kbd "/ x") 'ebdb-search-user-fields)
- (define-key km (kbd "| x") 'ebdb-search-user-fields)
- (define-key km (kbd "+ x") 'ebdb-search-user-fields)
- (define-key km (kbd "/ c") 'ebdb-search-modified)
- (define-key km (kbd "| c") 'ebdb-search-modified)
- (define-key km (kbd "+ c") 'ebdb-search-modified)
- (define-key km (kbd "/ t") 'ebdb-search-tags)
- (define-key km (kbd "| t") 'ebdb-search-tags)
- (define-key km (kbd "+ t") 'ebdb-search-tags)
- (define-key km (kbd "/ C") 'ebdb-search-record-class)
- (define-key km (kbd "/ C") 'ebdb-search-record-class)
- (define-key km (kbd "| C") 'ebdb-search-record-class)
- (define-key km (kbd "+ d") 'ebdb-search-duplicates)
- (define-key km (kbd "/ D") 'ebdb-search-database)
- (define-key km (kbd "| D") 'ebdb-search-database)
- (define-key km (kbd "+ D") 'ebdb-search-database)
- (define-key km (kbd "C-x n w") 'ebdb-display-all-records)
- (define-key km (kbd "C-x n d") 'ebdb-display-current-record)
- (define-key km (kbd "^") 'ebdb-search-pop)
-
- (define-key km [mouse-3] 'ebdb-mouse-menu)
+ (define-key km (kbd "/ /") #'ebdb)
+ (define-key km (kbd "/ 1") #'ebdb-search-single-record)
+ (define-key km (kbd "/ n") #'ebdb-search-name)
+ (define-key km (kbd "| n") #'ebdb-search-name)
+ (define-key km (kbd "+ n") #'ebdb-search-name)
+ (define-key km (kbd "/ o") #'ebdb-search-organization)
+ (define-key km (kbd "| o") #'ebdb-search-organization)
+ (define-key km (kbd "+ o") #'ebdb-search-organization)
+ (define-key km (kbd "/ p") #'ebdb-search-phone)
+ (define-key km (kbd "| p") #'ebdb-search-phone)
+ (define-key km (kbd "+ p") #'ebdb-search-phone)
+ (define-key km (kbd "/ a") #'ebdb-search-address)
+ (define-key km (kbd "| a") #'ebdb-search-address)
+ (define-key km (kbd "+ a") #'ebdb-search-address)
+ (define-key km (kbd "/ m") #'ebdb-search-mail)
+ (define-key km (kbd "| m") #'ebdb-search-mail)
+ (define-key km (kbd "+ m") #'ebdb-search-mail)
+ (define-key km (kbd "/ x") #'ebdb-search-user-fields)
+ (define-key km (kbd "| x") #'ebdb-search-user-fields)
+ (define-key km (kbd "+ x") #'ebdb-search-user-fields)
+ (define-key km (kbd "/ c") #'ebdb-search-modified)
+ (define-key km (kbd "| c") #'ebdb-search-modified)
+ (define-key km (kbd "+ c") #'ebdb-search-modified)
+ (define-key km (kbd "/ t") #'ebdb-search-tags)
+ (define-key km (kbd "| t") #'ebdb-search-tags)
+ (define-key km (kbd "+ t") #'ebdb-search-tags)
+ (define-key km (kbd "/ C") #'ebdb-search-record-class)
+ (define-key km (kbd "| C") #'ebdb-search-record-class)
+ (define-key km (kbd "+ C") #'ebdb-search-record-class)
+ (define-key km (kbd "+ d") #'ebdb-search-duplicates)
+ (define-key km (kbd "/ D") #'ebdb-search-database)
+ (define-key km (kbd "| D") #'ebdb-search-database)
+ (define-key km (kbd "+ D") #'ebdb-search-database)
+ (define-key km (kbd "C-x n w") #'ebdb-display-all-records)
+ (define-key km (kbd "C-x n d") #'ebdb-display-current-record)
+ (define-key km (kbd "^") #'ebdb-search-pop)
+
+ (define-key km [mouse-3] #'ebdb-mouse-menu)
(define-key km [mouse-2] (lambda (event)
;; Toggle record format
(interactive "e")
@@ -1178,9 +1178,9 @@ displayed records."
(defvar ebdb-completing-read-mails-map
(let ((map (copy-keymap minibuffer-local-completion-map)))
- (define-key map " " 'self-insert-command)
- (define-key map "\t" 'ebdb-complete-mail)
- (define-key map "\M-\t" 'ebdb-complete-mail)
+ (define-key map " " #'self-insert-command)
+ (define-key map "\t" #'ebdb-complete-mail)
+ (define-key map "\M-\t" #'ebdb-complete-mail)
map)
"Keymap used by `ebdb-completing-read-mails'.")
@@ -1270,21 +1270,22 @@ Derives from `special-mode'; the usual `special-mode'
bindings apply.
(list 24 (buffer-name) " "
'(:eval (format "%d/%d/%d"
(1+ (or (get-text-property
- (point) 'ebdb-record-number) -1))
+ (point) 'ebdb-record-number)
+ -1))
(length ebdb-records)
(length (ebdb-records))))
'(:eval (concat " "
(ebdb-concat " " (elt ebdb-modeline-info 0)
(elt ebdb-modeline-info 1))))))
(set (make-local-variable 'revert-buffer-function)
- 'ebdb-redisplay-all-records)
+ #'ebdb-redisplay-all-records)
;; In newer Emacs, this will make EBDB buffers eligible for save by
;; `save-some-buffers'.
(add-hook 'write-contents-functions #'ebdb-save-ebdb)
(setq buffer-offer-save 'always)
(when ebdb-mail-alias-alist
(ebdb-mail-aliases))
- (add-hook 'post-command-hook 'force-mode-line-update nil t))
+ (add-hook 'post-command-hook #'force-mode-line-update nil t))
(defun ebdb-save-ebdb (&optional some)
"Save all EBDB databases interactively.
@@ -2501,7 +2502,7 @@ The search results are displayed in the EBDB buffer using
formatter FMT."
(sit-for 0)))))
(ebdb-display-records (sort (delete-dups ret)
- 'ebdb-record-lessp)
+ #'ebdb-record-lessp)
fmt)))
;;;###autoload
@@ -2741,7 +2742,7 @@ as part of the MUA insinuation."
(completion-ignore-case t)
(completion (and orig
(try-completion orig ebdb-hashtable
- 'ebdb-completion-predicate)))
+ #'ebdb-completion-predicate)))
all-completions dwim-completions one-record)
(unless done
@@ -2760,14 +2761,14 @@ as part of the MUA insinuation."
(setq completion (substring completion 0 (match-beginning 0))))
(setq all-completions (all-completions orig ebdb-hashtable
- 'ebdb-completion-predicate))
+ #'ebdb-completion-predicate))
;; Resolve the records matching ORIG:
;; Multiple completions may match the same record
(let ((records (delete-dups
- (apply 'append (mapcar (lambda (compl)
- (gethash compl ebdb-hashtable))
- all-completions)))))
+ (apply #'append (mapcar (lambda (compl)
+ (gethash compl ebdb-hashtable))
+ all-completions)))))
;; Is there only one matching record?
(setq one-record (and (not (cdr records))
(car records))))
@@ -2875,7 +2876,7 @@ as part of the MUA insinuation."
(push (ebdb-dwim-mail record mail) dwim-completions))))))
(setq dwim-completions (sort (delete-dups dwim-completions)
- 'string-lessp))
+ #'string-lessp))
(cond ((not dwim-completions)
(message "Matching record has no mail field")
(sit-for 1)
@@ -3234,7 +3235,7 @@ Prompts for FORMATTER to use."
drec))
(kill-new (replace-regexp-in-string
"[ \t\n]*\\'" "\n"
- (mapconcat 'identity (nreverse drec) "")))))
+ (mapconcat #'identity (nreverse drec) "")))))
;;;###autoload
(defun ebdb-copy-fields-as-kill (records field &optional num)
diff --git a/ebdb-format.el b/ebdb-format.el
index 234e0e3..b12c173 100644
--- a/ebdb-format.el
+++ b/ebdb-format.el
@@ -1,6 +1,6 @@
;;; ebdb-format.el --- Formatting/exporting EBDB records -*- lexical-binding:
t; -*-
-;; Copyright (C) 2016-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
;; Author: Eric Abrahamsen <eric@ericabrahamsen.net>
@@ -64,7 +64,7 @@
:initarg :label
:type string
:initform "")
- (tracking-symbol :initform ebdb-formatter-tracker)
+ (tracking-symbol :initform 'ebdb-formatter-tracker)
(format-buffer-name
:initarg :format-buffer-name
:type string
diff --git a/ebdb-mhe.el b/ebdb-mhe.el
index d1096ee..aecc58e 100644
--- a/ebdb-mhe.el
+++ b/ebdb-mhe.el
@@ -1,6 +1,6 @@
;;; ebdb-mhe.el --- EBDB interface to mh-e -*- lexical-binding: t;
-*-
-;; Copyright (C) 2016-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
diff --git a/ebdb-mua.el b/ebdb-mua.el
index 1c7ab91..e72a2fd 100644
--- a/ebdb-mua.el
+++ b/ebdb-mua.el
@@ -1,6 +1,6 @@
;;; ebdb-mua.el --- Mail user agent interaction for EBDB -*- lexical-binding:
t; -*-
-;; Copyright (C) 2016-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
;; Author: Eric Abrahamsen <eric@ericabrahamsen.net>
@@ -142,7 +142,6 @@ Each element is of the form
The symbol CLASS defines a class of headers.
The strings HEADER belong to CLASS."
- :group 'ebdb-mua
:type 'list)
(defcustom ebdb-message-all-addresses nil
@@ -151,7 +150,6 @@ The strings HEADER belong to CLASS."
Otherwise this function returns only the first mail address of
each message."
- :group 'ebdb-mua
:type 'boolean)
(defcustom ebdb-message-try-all-headers nil
@@ -165,7 +163,6 @@ address is excluded because of `ebdb-user-mail-address-re')
but
`ebdb-message-try-all-headers' is t, then these commands will
also consider the email addresses in the remaining headers."
- :group 'ebdb-mua
:type 'boolean)
;; TODO: Handle more headers. Why not make it possible for EBDB to
@@ -192,7 +189,6 @@ or people posting about time travel.
If t accept all messages. If nil, accept all messages.
See also `ebdb-ignore-header-alist', which has the opposite effect."
- :group 'ebdb-mua
:type '(repeat (cons
(choice (symbol :tag "Sender" sender)
(symbol :tag "Recipients" recipients)
@@ -216,7 +212,6 @@ or messages sent to or CCed to either of two mailing lists.
If t ignore all messages. If nil do not ignore any messages.
See also `ebdb-accept-header-alist', which has the opposite effect."
- :group 'ebdb-mua
:type '(repeat (cons
(choice (symbol :tag "Sender" sender)
(symbol :tag "Recipients" recipients)
@@ -240,7 +235,6 @@ recipients' email addresses from a message according to
it matches `ebdb-user-mail-address-re'. This way the commands
will not operate on your own record. See also
`ebdb-message-try-all-headers'."
- :group 'ebdb-mua
:type '(choice (const :tag "Use addresses from `ebdb-record-self'" self)
(const :tag "Use the value of `message-alternative-emails'"
message)
(regexp :tag "Regexp matching your mail addresses")))
@@ -325,7 +319,6 @@ Allowed values are:
a regexp If the new name matches this regexp ignore it.
Otherwise query to add it.
See also `ebdb-add-aka'."
- :group 'ebdb-mua
:type '(choice (const :tag "Automatically use the new name" t)
(const :tag "Query for name changes" query)
(const :tag "Ignore the new name" nil)
@@ -344,7 +337,6 @@ Allowed values are:
a regexp If the alternate name matches this regexp ignore it.
Otherwise query to add it.
See also `ebdb-add-name'."
- :group 'ebdb-mua
:type '(choice (const :tag "Automatically store alternate names as AKA" t)
(const :tag "Query for alternate names" query)
(const :tag "Ignore alternate names" nil)
@@ -367,7 +359,6 @@ Allowed values are:
a regexp If the new mail address matches this regexp ignore the new
address.
Otherwise query to add it.
See also `ebdb-ignore-redundant-mails'."
- :group 'ebdb-mua
:type '(choice (const :tag "Automatically add new mail addresses" t)
(const :tag "Query before adding new mail addresses" query)
(const :tag "Never add new mail addresses" nil)
@@ -393,7 +384,6 @@ Allowed values are:
a regexp If the new mail address matches this regexp never ignore
this mail address. Otherwise query to ignore it.
See also `ebdb-add-mails' and `ebdb-canonicalize-mail-function'."
- :group 'ebdb-mua
:type '(choice (const :tag "Automatically ignore redundant mail addresses" t)
(const :tag "Query whether to ignore them" query)
(const :tag "Do not ignore redundant mail addresses" nil)
@@ -403,7 +393,6 @@ See also `ebdb-add-mails' and
`ebdb-canonicalize-mail-function'."
(defcustom ebdb-message-mail-as-name t
"If non-nil use mail address of message as fallback for name of new records."
- :group 'ebdb-mua
:type 'boolean)
(defcustom ebdb-notice-mail-hook nil
@@ -422,7 +411,6 @@ determine the header and class of the mail address
according to
If a message contains multiple mail addresses belonging to one EBDB record,
this hook is run for each mail address. Use `ebdb-notice-record-hook'
if you want to notice each record only once per message."
- :group 'ebdb-mua
:type 'hook)
(defcustom ebdb-notice-record-hook nil
@@ -434,8 +422,8 @@ address.
Run with two arguments: the record, and one of the symbols
'sender or 'recipient. It is up to the hook function to
-determine which MUA is used and to act appropriately." :group
-'ebdb-mua :type 'hook)
+determine which MUA is used and to act appropriately."
+ :type 'hook)
(cl-defgeneric ebdb-notice-record (record type)
"Inform RECORD that it's been \"noticed\".
@@ -469,7 +457,6 @@ are not \"noticed\", nor is the timestamp updated."
(defcustom ebdb-mua-pop-up t
"If non-nil, display an auto-updated EBDB window while using a MUA."
- :group 'ebdb-mua
:type 'boolean)
(defcustom ebdb-mua-default-formatter ebdb-default-multiline-formatter
@@ -479,7 +466,6 @@ The value should be an instance of the
`ebdb-formatter-ebdb-oneline' classes. Easy choices are the
value of `ebdb-default-multiline-formatter' or
`ebdb-default-oneline-formatter'."
- :group 'ebdb-mua
:type 'ebdb-formatter-ebdb)
@@ -499,7 +485,6 @@ addition, this list may also include the following elements:
These provide a fallback if a message does not have a matching RECORD
or if some FIELD of RECORD is empty."
- :group 'ebdb-mua
:type '(repeat (symbol :tag "Field")))
;; There are two ways to customize the mark shown for a record in an
@@ -541,7 +526,6 @@ or if some FIELD of RECORD is empty."
If nil do not mark message addresses known to EBDB.
See variable `ebdb-mua-summary-mark' and `ebdb-mua-summary-unify'.
See also the field class `ebdb-field-summary-mark'."
- :group 'ebdb-mua
:type '(choice (string :tag "Mark used")
(const :tag "Do not mark known posters" nil)))
@@ -556,7 +540,6 @@ example, use \"%n %*%a %-17.17UB %-3.3m %2d %4l/%-5c
`gnus-summary-line-format' / `vm-summary-format' is required to
use `ebdb-mua-summary-unify'. Currently no other MUAs support
this EBDB feature."
- :group 'ebdb-mua
:type 'string)
(defcustom ebdb-mua-summary-mark-format-letter "e"
@@ -570,7 +553,6 @@ example, use \"%n %*%a %Ue%-17.17F %-3.3m %2d %4l/%-5c
`gnus-summary-line-format' / `vm-summary-format' is required to
use function `ebdb-mua-summary-mark'. Currently no other MUAs
support this EBDB feature."
- :group 'ebdb-mua
:type 'string)
(defvar ebdb-mail-folder-list nil
@@ -843,7 +825,7 @@ Usually this function is called by the wrapper
`ebdb-mua-auto-update'."
(if (and records (not ebdb-message-all-addresses))
(setq address-list nil))))
(setq records
- (if sort (sort records 'ebdb-record-lessp)
+ (if sort (sort records #'ebdb-record-lessp)
;; Make RECORDS a list ordered like ADDRESS-LIST.
(nreverse records))))
diff --git a/ebdb-org.el b/ebdb-org.el
index 042d36b..5c3c897 100644
--- a/ebdb-org.el
+++ b/ebdb-org.el
@@ -1,6 +1,6 @@
;;; ebdb-org.el --- Org mode integration for EBDB -*- lexical-binding: t;
-*-
-;; Copyright (C) 2016-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
;; Author: Eric Abrahamsen <eric@ericabrahamsen.net>
;; Keywords:
@@ -72,7 +72,7 @@
:export 'ebdb-org-export)
(with-no-warnings ;; I know it's obsolete.
(org-add-link-type "ebdb" #'ebdb-org-open #'ebdb-org-export)
- (add-hook 'org-store-link-functions 'ebdb-org-store-link)))
+ (add-hook 'org-store-link-functions #'ebdb-org-store-link)))
;; TODO: Put a custom keymap on the links (or else expand
;; `ebdb-org-open') so that users can choose what to do with the
diff --git a/ebdb-pgp.el b/ebdb-pgp.el
index 8b9cdf9..fe3961f 100644
--- a/ebdb-pgp.el
+++ b/ebdb-pgp.el
@@ -1,6 +1,6 @@
;;; ebdb-pgp.el --- Interaction between EBDB and PGP -*- lexical-binding: t;
-*-
-;; Copyright (C) 2016-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
;; Author: Eric Abrahamsen <eric@ericabrahamsen.net>
@@ -161,8 +161,8 @@ reasons why. Instead, you might want to call the command
If you do decide to set up automatic signing/encryption hooks,
use one of the following, as appropriate:
-(add-hook 'message-send-hook 'ebdb-pgp)
-(add-hook 'mail-send-hook 'ebdb-pgp)"
+ (add-hook 'message-send-hook #'ebdb-pgp)
+ (add-hook 'mail-send-hook #'ebdb-pgp)"
(interactive)
(save-excursion
(save-restriction
@@ -182,7 +182,7 @@ use one of the following, as appropriate:
record 'ebdb-field-pgp)))
(slot-value field 'action)))
(delete-dups
- (apply 'nconc
+ (apply #'nconc
(mapcar
(lambda (address)
(ebdb-message-search (car address)
diff --git a/ebdb-vcard.el b/ebdb-vcard.el
index 5ffc0e7..92fd32a 100644
--- a/ebdb-vcard.el
+++ b/ebdb-vcard.el
@@ -1,6 +1,6 @@
;;; ebdb-vcard.el --- vCard export and import routine for EBDB -*-
lexical-binding: t; -*-
-;; Copyright (C) 2016-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
;; Author: Eric Abrahamsen <eric@ericabrahamsen.net>
@@ -74,7 +74,6 @@
ebdb-field-tags)
:header nil)
"The default formatter for VCard 4.0 exportation."
- :group 'ebdb-vcard
:type 'ebdb-formatter-vcard)
(defcustom ebdb-vcard-default-30-formatter
@@ -96,7 +95,6 @@
ebdb-field-tags)
:header nil)
"The default formatter for VCard 3.0 exportation."
- :group 'ebdb-vcard
:type 'ebdb-formatter-vcard)
(defcustom ebdb-vcard-label-alist
@@ -119,8 +117,6 @@ This alist is neither exhaustive nor authoritative. It's
purpose
is to simplify property labeling during the export process, and
to classify properties during import. The import process does
not always respect these headings."
-
- :group 'ebdb-vcard
:type '(repeat
(cons string symbol)))
diff --git a/ebdb.el b/ebdb.el
index 7501a9e..bdaffa0 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -1,9 +1,9 @@
;;; ebdb.el --- Contact management package -*- lexical-binding: t;
-*-
-;; Copyright (C) 2016-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
;; Version: 0.7
-;; Package-Requires: ((emacs "25.1") (cl-lib "0.5") (seq "2.15"))
+;; Package-Requires: ((emacs "25.1") (seq "2.15"))
;; Maintainer: Eric Abrahamsen <eric@ericabrahamsen.net>
@@ -954,7 +954,7 @@ Test for presence is done with `equal'."
:type (or null ebdb-field-uuid)
:initform nil)
(tracking-symbol
- :initform ebdb-record-tracker)
+ :initform 'ebdb-record-tracker)
(creation-date
:initarg :creation-date
:type (or null ebdb-field-creation-date)
@@ -1064,7 +1064,7 @@ Then call `cl-call-next-method' with the new values.")
(cl-defmethod ebdb-parse ((field-class (subclass ebdb-field)) str &optional
slots)
"Create the actual field instance."
(condition-case nil
- (apply 'make-instance field-class slots)
+ (apply #'make-instance field-class slots)
(error (signal 'ebdb-unparseable (list str)))))
(cl-defmethod ebdb-parse :before ((_field-class (subclass ebdb-field)) str
&optional _slots)
@@ -1132,7 +1132,7 @@ responsible for creating the field object.
The OBJ argument is used when editing existing fields: OBJ is the
old field. By now we've sucked all the useful information out of
it, and if this process is successful it will get deleted."
- (apply 'make-instance class slots))
+ (apply #'make-instance class slots))
(cl-defmethod ebdb-read :around ((_cls (subclass ebdb-field))
&optional _slots _obj)
@@ -1340,7 +1340,7 @@ process."
"List of existing labels of user fields.")
(defclass ebdb-field-user-simple (ebdb-field-labeled ebdb-field-user)
- ((label-list :initform ebdb-user-label-list)
+ ((label-list :initform 'ebdb-user-label-list)
(value
:initarg :value
:type (or atom list)
@@ -1559,7 +1559,7 @@ first one."
(defvar ebdb-role-label-list nil)
(defclass ebdb-field-role (ebdb-field-labeled ebdb-field)
- ((label-list :initform ebdb-role-label-list)
+ ((label-list :initform 'ebdb-role-label-list)
(record-uuid
:initarg :record-uuid
:type (or null string)
@@ -1700,7 +1700,7 @@ first one."
(priority
:initarg :priority
:type (or null symbol)
- :initform normal
+ :initform 'normal
:custom (choice (const :tag "Normal priority" normal)
(const :tag "Primary address" primary)
(const :tag "Defunct address" defunct))
@@ -1791,7 +1791,7 @@ Primary sorts before normal sorts before defunct."
;;; Address fields
(defclass ebdb-field-address (ebdb-field-labeled ebdb-field)
- ((label-list :initform ebdb-address-label-list)
+ ((label-list :initform 'ebdb-address-label-list)
(streets
:initarg :streets
:type (list-of string)
@@ -1913,7 +1913,7 @@ The result looks like this:
country
(ebdb-i18n-countries)))))
(concat (if streets
- (concat (mapconcat 'identity streets "\n") "\n"))
+ (concat (mapconcat #'identity streets "\n") "\n"))
(ebdb-concat ", " (ebdb-address-locality address)
(ebdb-concat " " (ebdb-address-region address)
(ebdb-address-postcode address)))
@@ -1923,7 +1923,7 @@ The result looks like this:
;;; Phone fields
(defclass ebdb-field-phone (ebdb-field-labeled ebdb-field)
- ((label-list :initform ebdb-phone-label-list)
+ ((label-list :initform 'ebdb-phone-label-list)
(country-code
:initarg :country-code
:type (or null number)
@@ -2137,7 +2137,7 @@ If optional arg REPLACE is non-nil, replace any existing
notes.")
(defvar ebdb-anniversary-label-list '("birthday" "marriage" "death"))
(defclass ebdb-field-anniversary (ebdb-field-labeled ebdb-field-user)
- ((label-list :initform ebdb-anniversary-label-list)
+ ((label-list :initform 'ebdb-anniversary-label-list)
(date
:initarg :date
:type list
@@ -2149,7 +2149,7 @@ If optional arg REPLACE is non-nil, replace any existing
notes.")
(calendar
:initarg :calendar
:type symbol
- :initform gregorian
+ :initform 'gregorian
:custom symbol
:documentation "The calendar to which this date applies.")
(actions
@@ -2175,8 +2175,8 @@ Eventually this method will go away."
(month (cdr (assoc-string
(completing-read
"Month: "
- (mapcar 'list (append
- calendar-month-name-array nil))
+ (mapcar #'list (append
+ calendar-month-name-array nil))
nil t (when obj
(aref
calendar-month-name-array
@@ -2241,7 +2241,7 @@ Eventually this method will go away."
"List of known ID labels.")
(defclass ebdb-field-id (ebdb-field-labeled ebdb-field-obfuscated
ebdb-field-user)
- ((label-list :initform ebdb-id-label-list)
+ ((label-list :initform 'ebdb-id-label-list)
(id-number
:type string
:custom string
@@ -2268,7 +2268,7 @@ Eventually this method will go away."
"grandmother" "grandfather" "wife"
"husband"))
(defclass ebdb-field-relation (ebdb-field-labeled ebdb-field)
- ((label-list :initform ebdb-relation-label-list)
+ ((label-list :initform 'ebdb-relation-label-list)
(rel-uuid
:initarg :rel-uuid
:type string
@@ -2357,7 +2357,7 @@ Removes relation information from the
(defclass ebdb-field-url (ebdb-field-labeled ebdb-field-user)
((label-list
- :initform ebdb-url-label-list)
+ :initform 'ebdb-url-label-list)
(url
:type string
:initarg :url
@@ -2409,7 +2409,7 @@ See `ebdb-url-valid-schemes' for a list of acceptable
schemes."
:type string
:custom string
:documentation "Timezone in tzdata/Olson format, eg \"Europe/Berlin\".")
- (actions :initform (("Display current time" . ebdb-location-current-time))))
+ (actions :initform '(("Display current time" .
ebdb-location-current-time))))
:documentation "Field holding location data for the record.
Data is in three parts: an arbitrary location string, a cons of
lat/long geodata, and a tzdata/Olson timezone string."
@@ -2863,7 +2863,7 @@ RECORD is responsible for parsing it correctly.")
(let ((notes (ebdb-with-exit (ebdb-read ebdb-default-notes-class))))
(when notes
(setq slots (plist-put slots :notes notes)))
- (apply 'make-instance class slots)))
+ (apply #'make-instance class slots)))
(cl-defmethod ebdb-delete-record ((record ebdb-record) &optional db unload)
(let ((dbs (if db (if (consp db) db (list db))
@@ -4843,10 +4843,10 @@ The inverse function of `ebdb-split'."
(if (symbolp separator)
(setq separator (nth 1 (or (cdr (assq separator ebdb-separator-alist))
ebdb-default-separator))))
- (mapconcat 'identity
- (delete "" (apply 'append (mapcar (lambda (x) (if (stringp x)
- (list x) x))
- strings)))
+ (mapconcat #'identity
+ (delete "" (apply #'append (mapcar (lambda (x)
+ (if (stringp x) (list x) x))
+ strings)))
separator))
(defun ebdb-list-strings (list)
@@ -4940,7 +4940,7 @@ See also `ebdb-decompose-ebdb-address'.
If optional argument ALL is non-nil, pass it to
`mail-extract-address-components' to extract multiple addresses."
(if all
- (mapcar 'ebdb-clean-address-components
+ (mapcar #'ebdb-clean-address-components
(mail-extract-address-components address t))
(ebdb-clean-address-components (mail-extract-address-components address))))