emacs-elpa-diffs
[Top][All Lists]
Advanced

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

[elpa] externals/ebdb 8573c7f 02/10: Fix argument order in ebdb-read-i18


From: Eric Abrahamsen
Subject: [elpa] externals/ebdb 8573c7f 02/10: Fix argument order in ebdb-read-i18n
Date: Fri, 8 Oct 2021 13:59:54 -0400 (EDT)

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

    Fix argument order in ebdb-read-i18n
    
    * ebdb-i18n.el (ebdb-read-i18n): The spec needs to come right after
    the class type so it can be specialized on. The generic had this
    wrong, which didn't matter except for documentation purposes.
    (ebdb-read): The address version was right; the phone version was
    wrong. Luckily we aren't using `ebdb-read' methods with phones:
    they're all parsed.
---
 ebdb-i18n.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ebdb-i18n.el b/ebdb-i18n.el
index 783bbca..ac21a79 100644
--- a/ebdb-i18n.el
+++ b/ebdb-i18n.el
@@ -624,9 +624,8 @@ per ISO 3166-1 alpha 3.")
 ("Zimbabwe" .  263))
   "Mapping of country names to country-code numbers.")
 
-(cl-defgeneric ebdb-read-i18n (class slots obj spec)
+(cl-defgeneric ebdb-read-i18n (class spec slots obj)
   "An internationalized version of `ebdb-read'.
-
 This works the same as `ebdb-read', plus an additional argument
 SPEC.  What SPEC is depends on CLASS, but might be a phone
 country code, or a country symbol, or a script symbol.
@@ -765,7 +764,7 @@ for their symbol representations."
     (setq slots (plist-put slots :country-code country))
     (setq slots
          (condition-case nil
-             (ebdb-read-i18n class slots obj country)
+             (ebdb-read-i18n class country slots obj)
            (cl-no-method
             slots)))
     (cl-call-next-method class slots obj)))



reply via email to

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