[elpa] externals/ebdb dff7a1c432 4/4: More compiler quieting

[Eric Abrahamsen]

branch: externals/ebdb
commit dff7a1c43223d1a2b218f4a2efc85c80a5cc0c03
Author: Eric Abrahamsen <eric@ericabrahamsen.net>
Commit: Eric Abrahamsen <eric@ericabrahamsen.net>

    More compiler quieting
    
    Thanks to Arash Esbati for his continued persistence.
---
 ebdb-com.el        |  2 +-
 ebdb-i18n-basic.el | 11 +++++------
 ebdb-migrate.el    |  2 +-
 ebdb-pgp.el        |  4 ++--
 ebdb-vcard.el      |  4 ++--
 ebdb.el            |  6 +++---
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/ebdb-com.el b/ebdb-com.el
index 0086b4c38f..2599a218a1 100644
--- a/ebdb-com.el
+++ b/ebdb-com.el
@@ -857,7 +857,7 @@ string."
                              inst " "))
                 field-list ", ")))))
 
-(cl-defgeneric ebdb-make-buffer-name (&context (major-mode t))
+(cl-defgeneric ebdb-make-buffer-name (&context major-mode)
   "Return the buffer to be used by EBDB.
 
 This examines the current major mode, and makes a decision from
diff --git a/ebdb-i18n-basic.el b/ebdb-i18n-basic.el
index 8a44931563..d62549ba2c 100644
--- a/ebdb-i18n-basic.el
+++ b/ebdb-i18n-basic.el
@@ -235,12 +235,11 @@ itself."
                         (setq str (replace-regexp-in-string
                                    extension-regexp "" str))))))
 
-    (condition-case nil
-       (setq slots (plist-put
-                    slots
-                    :number
-                    (replace-regexp-in-string
-                     "[^[:digit:]]" "" str))))
+    (setq slots (plist-put
+                slots
+                :number
+                (replace-regexp-in-string
+                 "[^[:digit:]]" "" str)))
     slots))
 
 (defvar ebdb-i18n-german-states
diff --git a/ebdb-migrate.el b/ebdb-migrate.el
index 48f3bdf1cd..168799496b 100644
--- a/ebdb-migrate.el
+++ b/ebdb-migrate.el
@@ -671,7 +671,7 @@ BBDB sets the default of that option."
           (setq migrate (< file-format ebdb-file-format)))
        (unless (re-search-forward "^\\[" nil t)
          (error "Unreadabe BBDB file: no contacts found"))
-       (goto-char (point-at-bol))
+       (goto-char (line-beginning-position))
         ;; narrow the buffer to skip over the rubbish before the first record.
         (narrow-to-region (point) (point-max))
         (let ((modp (buffer-modified-p))
diff --git a/ebdb-pgp.el b/ebdb-pgp.el
index 57a7b9cf53..9e39ba1e65 100644
--- a/ebdb-pgp.el
+++ b/ebdb-pgp.el
@@ -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
diff --git a/ebdb-vcard.el b/ebdb-vcard.el
index 849677e998..3c69a49439 100644
--- a/ebdb-vcard.el
+++ b/ebdb-vcard.el
@@ -330,11 +330,11 @@ method is just responsible for formatting the record 
name."
   (with-slots (priority) mail
     (concat
      (cl-call-next-method)
-     (cl-case priority
+     (pcase priority
        ('primary ";PREF=1")
        ('normal ";PREF=10")
        ('defunct ";PREF=100")
-       (t "")))))
+       (_ "")))))
 
 (cl-defmethod ebdb-fmt-field-label ((_f ebdb-formatter-vcard)
                                    (field ebdb-field-labeled)
diff --git a/ebdb.el b/ebdb.el
index 5956250934..b030e17a25 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -4411,7 +4411,7 @@ of sync but has no local modifications.")
            nil
          (signal err (list db))))))
 
-(cl-defgeneric ebdb-db-save ((db ebdb-db) &optional prompt force)
+(cl-defgeneric ebdb-db-save (db &optional prompt force)
   "Save DB to its persistence file.
 When PROMPT is non-nil, prompt the user before saving (currently
 unimplemented).  When FORCE is non-nil, save regardless of
@@ -4834,8 +4834,8 @@ If LABEL is a string, return the mail with that label.  If
 DEFUNCT is non-nil, also consider RECORD's defunct mail
 addresses.  Sort mails by descending priority.")
 
-(cl-defmethod ebdb-record-mail :around ((record ebdb-record)
-                                       &optional no-roles label defunct)
+(cl-defmethod ebdb-record-mail :around ((_record ebdb-record)
+                                       &optional _no-roles label defunct)
   (let ((found (cl-call-next-method)))
     (unless defunct
       (setq found