summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Abrahamsen <eric@ericabrahamsen.net>2017-08-16 11:16:51 -0700
committerEric Abrahamsen <eric@ericabrahamsen.net>2017-08-16 11:36:07 -0700
commit1ee38b903b6966de499035360aa1ea9459aae5c9 (patch)
tree7ee6b11e3f51fd87cd2ada90694ca991d35fbf75
parent377c1eccaa0e2134591e5333465c27ed31562d8e (diff)
Re-convolute ebdb-string-i18n for addresses
* packages/ebdb-i18n-chn/ebdb-i18n-chn.el (ebdb-string-i18n): Dunno how that happened.
-rw-r--r--ebdb-i18n-chn.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/ebdb-i18n-chn.el b/ebdb-i18n-chn.el
index 82ad9fb..82feb80 100644
--- a/ebdb-i18n-chn.el
+++ b/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