branch: master
commit e95cb9aeb0f1dcbac40ae55d8040f77f8bf4c978
Author: Kaushal Modi <[email protected]>
Commit: Kaushal Modi <[email protected]>
Adapt to ucs-names now being a hash table in emacs 26+
* counsel.el (counsel-unicode-char): Generated a formatted hash if
`ucs-names`
returns a hash (as it would, on emacs 26+).
(http://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-26&id=96c2c098aeed5c85733577ebbdaf33af6fbb59e9)
This change will make `counsel-unicode-char` work in emacs 26.1 as well as
older
versions where ucs-names returned a list.
---
counsel.el | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/counsel.el b/counsel.el
index 9e770ca..bdc593f 100644
--- a/counsel.el
+++ b/counsel.el
@@ -393,16 +393,27 @@ Update the minibuffer with the amount of lines collected
every
COUNT defaults to 1."
(interactive "p")
(let ((minibuffer-allow-text-properties t)
- (ivy-sort-max-size (expt 256 6)))
+ (ivy-sort-max-size (expt 256 6))
+ (ucs-map (ucs-names))
+ (ucs-map-fmtd (make-hash-table :test 'equal)))
(setq ivy-completion-beg (point))
(setq ivy-completion-end (point))
(ivy-read "Unicode name: "
- (nreverse
- (mapcar (lambda (x)
- (propertize
- (format "%06X % -60s%c" (cdr x) (car x) (cdr x))
- 'result (cdr x)))
- (ucs-names)))
+ (if (hash-table-p ucs-map)
+ (progn
+ (maphash (lambda (key val)
+ (let ((key-fmtd (propertize
+ (format "%06X % -60s%c" val
key val)
+ 'result val)))
+ (puthash key-fmtd nil ucs-map-fmtd)))
+ ucs-map)
+ ucs-map-fmtd)
+ (nreverse
+ (mapcar (lambda (x)
+ (propertize
+ (format "%06X % -60s%c" (cdr x) (car x) (cdr x))
+ 'result (cdr x)))
+ ucs-map)))
:action (lambda (char)
(with-ivy-window
(delete-region ivy-completion-beg ivy-completion-end)
