branch: externals/ebdb
commit f7b50402cf672448c4999e069b8b58294ef18595
Author: Eric Abrahamsen <[email protected]>
Commit: Eric Abrahamsen <[email protected]>
Final round of compiler quieting
Thanks again to Arash Esbati
Not all the way there, but I don't know what to do about the format
complaints.
---
ebdb-com.el | 13 +++++++------
ebdb-gnus.el | 15 ++++++++-------
ebdb-i18n-basic.el | 5 +++++
ebdb-i18n.el | 14 +++++++-------
ebdb-mua.el | 2 +-
ebdb-snarf.el | 4 ++--
ebdb-vm.el | 4 ++--
ebdb.el | 9 +++++----
8 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/ebdb-com.el b/ebdb-com.el
index 2599a218a1..2591a9b3bf 100644
--- a/ebdb-com.el
+++ b/ebdb-com.el
@@ -456,7 +456,7 @@ and \\='role, and the special shortcuts \\='mail-primary,
If this option is set, *only* fields listed here will be
displayed. Also see `ebdb-default-multiline-exclude'."
- :type 'list
+ :type '(repeat symbol)
:group 'ebdb-record-display)
(defcustom ebdb-default-multiline-exclude
@@ -472,7 +472,7 @@ and \\='role, and the special shortcuts \\='mail-primary,
If `ebdb-default-multiline-include' is set, this option will be
ignored."
- :type 'list
+ :type '(repeat symbol)
:group 'ebdb-record-display)
(defcustom ebdb-default-multiline-combine
@@ -486,7 +486,7 @@ as well as the shortcuts \\='mail, \\='phone, \\='address,
\\='notes, \\='tags,
and \\='role, and the special shortcuts \\='mail-primary,
\\='mail-defunct, \\='mail-not-defunct, \\='role-defunct, and
\\='role-not-defunct."
- :type 'list
+ :type '(repeat symbol)
:group 'ebdb-record-display)
(defcustom ebdb-default-multiline-collapse
@@ -500,7 +500,7 @@ as well as the shortcuts \\='mail, \\='phone, \\='address,
\\='notes, \\='tags,
and \\='role, and the special shortcuts \\='mail-primary,
\\='mail-defunct, \\='mail-not-defunct, \\='role-defunct, and
\\='role-not-defunct."
- :type 'list
+ :type '(repeat symbol)
:group 'ebdb-record-display)
(defcustom ebdb-default-multiline-formatter
@@ -516,7 +516,7 @@ and \\='role, and the special shortcuts \\='mail-primary,
(defcustom ebdb-default-oneline-include '(mail-primary)
"Fields to include in the default oneline view."
- :type 'list
+ :type '(repeat symbol)
:group 'ebdb-record-display)
(defcustom ebdb-default-oneline-formatter
@@ -857,7 +857,8 @@ string."
inst " "))
field-list ", ")))))
-(cl-defgeneric ebdb-make-buffer-name (&context major-mode)
+;;; This actually takes a &context on major-mode.
+(cl-defgeneric ebdb-make-buffer-name ()
"Return the buffer to be used by EBDB.
This examines the current major mode, and makes a decision from
diff --git a/ebdb-gnus.el b/ebdb-gnus.el
index 7782d28b37..3f6bab77ac 100644
--- a/ebdb-gnus.el
+++ b/ebdb-gnus.el
@@ -213,15 +213,16 @@ based on the contents of the EBDB.
Mail address elements are already `regexp-quote'-ed, so we just
concat them. Please note: in order that this will work with the
`nnimap-split-fancy' or `nnmail-split-fancy' methods you have to
-use a backquote template, that is your setting will look like:
+use a backquote template, in other words your Gnus server
+variable will look like:
-\(setq nnimap-split-rule 'nnimap-split-fancy
- nnimap-split-inbox \"INBOX\"
- nnimap-split-fancy
- `(| ,@(ebdb/gnus-split-folders-list)
- ... ))
+\(nnimap \"imap.example.com\"
+ (nnimap-inbox \"INBOX\")
+ (nnimap-split-fancy
+ \\=`(| ,@(ebdb/gnus-split-folders-list)
+ ... )))
-Note that `( is the backquote, NOT the quote '(."
+Note that \\=`( is the backquote, NOT the quote \\='(."
(mapcar
(lambda (elt)
(list "From"
diff --git a/ebdb-i18n-basic.el b/ebdb-i18n-basic.el
index d62549ba2c..997a50561c 100644
--- a/ebdb-i18n-basic.el
+++ b/ebdb-i18n-basic.el
@@ -29,6 +29,11 @@
;; For `with-slots'.
(require 'eieio))
+(declare-function ebdb-i18n-countries "ebdb-i18n")
+(declare-function ebdb-with-exit "ebdb")
+(declare-function ebdb-address-region "ebdb")
+(declare-function ebdb-read-string "ebdb")
+
;;; USA
(defvar ebdb-i18n-usa-states
diff --git a/ebdb-i18n.el b/ebdb-i18n.el
index a3b8cf324a..49175d264e 100644
--- a/ebdb-i18n.el
+++ b/ebdb-i18n.el
@@ -49,15 +49,15 @@
:group 'ebdb)
(defcustom ebdb-i18n-ignorable-scripts '(latin)
- "A list of script types that should be considered \"standard\";
- ie, no special handling will be done for them."
- :type 'list
+ "A list of script types that should be considered \"standard\".
+That is, no special handling will be done for them."
+ :type '(repeat :tag "Script type" symbol)
:group 'ebdb-i18n)
-(defcustom ebdb-i18n-countries-pref-scripts nil
+(defcustom ebdb-i18ngroup-countries-pref-scripts nil
"An alist equivalent to `ebdb-i18n-countries', but in alternate scripts.
-Ie, each alist element is a cons of a country name, in a
-non-English script, plus the same three-letter symbol as found in
+Each alist element is a cons of a country name, in a non-English
+script, plus the same three-letter symbol as found in
`ebdb-i18n-countries'. This is meant to allow country names to
be listed in the country's own script, but the name can be given
in any script the user prefers.
@@ -66,7 +66,7 @@ Any country name listed here will be offered along with the
English version for completion, and will be preferred over the
English version for display."
- :type 'list
+ :type '(repeat (cons string string))
:group 'ebdb-i18n)
;; defvars come first to pacify compiler.
diff --git a/ebdb-mua.el b/ebdb-mua.el
index 98318dacd4..2c6fbec676 100644
--- a/ebdb-mua.el
+++ b/ebdb-mua.el
@@ -142,7 +142,7 @@ Each element is of the form
The symbol CLASS defines a class of headers.
The strings HEADER belong to CLASS."
- :type 'list)
+ :type '(repeat (symbol (list string))))
(defcustom ebdb-message-all-addresses nil
"If t `ebdb-update-records' returns all mail addresses of a message.
diff --git a/ebdb-snarf.el b/ebdb-snarf.el
index 0b39d61ff5..d44191b5de 100644
--- a/ebdb-snarf.el
+++ b/ebdb-snarf.el
@@ -61,7 +61,7 @@ expression should contain at least one parenthetical group:
the
\(match-string 1)."
:group 'ebdb-snarf
- :type 'list)
+ :type '(repeat (symbol string)))
(defcustom ebdb-snarf-name-re
(list "\\(?:[[:upper:]][[:lower:]'-]+[,.[:blank:]]*\\)\\{2,\\}")
@@ -75,7 +75,7 @@ Regular expressions in this list should not include
parenthetical
groups."
:group 'ebdb-snarf
- :type 'list)
+ :type '(repeat string))
;;;###autoload
(defun ebdb-snarf (&optional string start end recs ret)
diff --git a/ebdb-vm.el b/ebdb-vm.el
index 0190bdd51d..cdac018046 100644
--- a/ebdb-vm.el
+++ b/ebdb-vm.el
@@ -256,7 +256,7 @@ and as the label to apply to the message.
If an element is a cons pair (VALUE . LABEL), VALUE is the field value
to search for and LABEL is the label to apply."
:group 'ebdb-mua-vm
- :type 'list)
+ :type '(repeat string))
(defcustom ebdb/vm-auto-add-label-field 'ebdb-mail-alias-field
"Fields used by `ebdb/vm-auto-add-label' to automatically label messages.
@@ -264,7 +264,7 @@ This is either a single EBDB field or a list of fields that
`ebdb/vm-auto-add-label' uses to check for labels to apply to a message.
Defaults to `ebdb-mail-alias-field' which defaults to `mail-alias'."
:group 'ebdb-mua-vm
- :type '(choice symbol list))
+ :type '(choice symbol (repeat symbol)))
(defun ebdb/vm-auto-add-label (record)
"Automatically add labels to VM messages.
diff --git a/ebdb.el b/ebdb.el
index b030e17a25..e4861c2756 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -331,7 +331,8 @@ If a string, assume a system executable. If a symbol,
assume an
elisp function for creating UUIDs. For instance, `org-id-uuid'
is a good candidate."
:group 'ebdb
- :type '(or string symbol))
+ :type '(choice (string :tag "System executable name")
+ (function :tag "Function creating UUIDs")))
(defcustom ebdb-record-self nil
"The UUID of the record representing the user.
@@ -346,7 +347,7 @@ behavior in any way. You can also require the \"ebdb-i18n\"
library for more internationally-aware functionality, in which
case this variable will be ignored."
:group 'ebdb
- :type '(list-of string))
+ :type '(repeat string))
(defcustom ebdb-default-address-format-function #'ebdb-format-address-default
"Default function used to format an address.
@@ -506,7 +507,7 @@ search is not a string, it will not be passed through these
functions."
:group 'ebdb-search
- :type 'list)
+ :type '(repeat :tag "String transformation function" function))
(defcustom ebdb-case-fold-search (default-value 'case-fold-search)
"Value of `case-fold-search' used when searching EBDB records."
@@ -536,7 +537,7 @@ and a record, and returns t if the key is acceptable for
returning that record."
:group 'ebdb-search
:package-version "0.2"
- :type '(repeat (cons symbol functionp)))
+ :type '(repeat (cons symbol function)))
(defcustom ebdb-signal-program (executable-find "signal-cli")
"The name of the signal-cli program, if installed.
