[elpa] master e7b3014 1/3: Re-convolute ebdb-string-i18n for addresses

[Eric Abrahamsen]

branch: master
commit e7b301489ef4d7d12af197b916bc949c92b3b3fc
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    Re-convolute ebdb-string-i18n for addresses
    
    * packages/ebdb-i18n-chn/ebdb-i18n-chn.el (ebdb-string-i18n): Dunno
      how that happened.
---
 packages/ebdb-i18n-chn/ebdb-i18n-chn.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/ebdb-i18n-chn/ebdb-i18n-chn.el 
b/packages/ebdb-i18n-chn/ebdb-i18n-chn.el
index 82ad9fb..82feb80 100644
--- a/packages/ebdb-i18n-chn/ebdb-i18n-chn.el
+++ b/packages/ebdb-i18n-chn/ebdb-i18n-chn.el
@@ -72,8 +72,8 @@
 
 (cl-defmethod ebdb-string-i18n ((adr ebdb-field-address)
                                (_cc (eql chn)))
-  (if (eql (aref char-script-table (aref (car streets) 0)) 'han)
-      (with-slots (streets locality region postcode) adr
+  (with-slots (streets locality region postcode) adr
+    (if (eql (aref char-script-table (aref (car streets) 0)) 'han)
        (concat
         ;; There are four municipalities, we don't need to repeat
         ;; city-plus-province for them.
@@ -81,8 +81,8 @@
           region)
         locality
         (mapconcat #'identity streets "")
-        ", " postcode))
-    (ebdb-format-address address 2)))
+        ", " postcode)
+      (ebdb-format-address adr 2))))
 
 ;; This isn't all of them, but it seems like a reasonable subset.  See
 ;; https://en.wikipedia.org/wiki/Chinese_compound_surname for a fuller