[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/ebdb c6bfefc: * ebdb: Fix a few compilation warnings

From: Stefan Monnier
Subject: [elpa] externals/ebdb c6bfefc: * ebdb: Fix a few compilation warnings
Date: Tue, 15 Aug 2017 18:19:16 -0400 (EDT)

branch: externals/ebdb
commit c6bfefc3b8ae405c1986b578cd260b60ca0de2e2
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * ebdb: Fix a few compilation warnings
    * ebdb.el (ebdb-record-insert-field, ebdb-record-delete-field):
    Can't dispatch on optional args.
    (ebdb-i18n-countries-pref-scripts): Declare.
    (ebdb-records-cite): Fix typo.
    * .gitignore: Ignore files generated when installed and edited in place.
 .gitignore | 5 +++++
 ebdb.el    | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f8500e6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
diff --git a/ebdb.el b/ebdb.el
index e6bcb0e..18efdc4 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -2472,7 +2472,7 @@ OLD-FIELD's values as defaults.")
 (cl-defmethod ebdb-record-insert-field ((record ebdb-record)
                                        (field ebdb-field)
-                                       &optional (slot symbol))
+                                       &optional slot)
   "Add FIELD to RECORD's SLOT."
   ;; First, the databases "actually" add the field to the record, ie
   ;; persistence.  The rest of this method is just updating the
@@ -2500,7 +2500,7 @@ OLD-FIELD's values as defaults.")
 (cl-defmethod ebdb-record-delete-field ((record ebdb-record)
                                        (field ebdb-field)
-                                       &optional (slot symbol))
+                                       &optional slot)
   "Delete FIELD from RECORD's SLOT, or set SLOT to nil, if no FIELD."
   ;; We don't use `slot-makeunbound' because that's a huge pain in the
   ;; ass, and why would anyone want those errors?
@@ -4706,6 +4706,8 @@ This is a possible identifying function for
   (string-match ebdb-continental-postcode-regexp
                 (ebdb-address-postcode address)))
+(defvar ebdb-i18n-countries-pref-scripts)
 ;; This function can provide some guidance for writing
 ;; your own address formatting function
 (defun ebdb-format-address-default (address)
@@ -4856,7 +4858,7 @@ This is a generic function that dispatches on the value of
                                         (_records list)
                                         &context (major-mode org-mode))
   (let ((lst (cl-call-next-method)))
-    (mapconcat #'identity list " ")))
+    (mapconcat #'identity lst " ")))
 (cl-defmethod ebdb-records-cite
   (_style (records list) &context (major-mode org-mode))

reply via email to

[Prev in Thread] Current Thread [Next in Thread]