[elpa] externals/ebdb a5ffda9 33/33: Merge remote-tracking branch 'elpa/externals/ebdb'

[Eric Abrahamsen]

branch: externals/ebdb
commit a5ffda917a255558c0ed265ed44a2f4b269867a6
Merge: 2ec37b9 c6bfefc
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    Merge remote-tracking branch 'elpa/externals/ebdb'
---
 .gitignore | 5 +++++
 ebdb.el    | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f8500e6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*.elc
+ebdb-autoloads.el
+ebdb-pkg.el
+ChangeLog
+
diff --git a/ebdb.el b/ebdb.el
index ad9da20..73b64c3 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -2584,7 +2584,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
@@ -2612,7 +2612,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?
@@ -4846,6 +4846,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)