2 files changed, 8 insertions, 5 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 4ebf97d3163..cd5f08989fc 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * unidata/unidata-gen.el (unidata-gen-table-word-list): Use alist-get
+        and cl-incf.
+
 2014-09-08  Eli Zaretskii  <eliz@gnu.org>
 
         * unidata/unidata-gen.el (unidata-check): Bring this function up
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index fb9b6dccc72..ec4f9d154d2 100644
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -88,6 +88,8 @@
 ;; CHAR-or-RANGE: a character code or a cons of character codes
 ;; PROPn: string representing the nth property value
 
+(eval-when-compile (require 'cl-lib))
+
 (defvar unidata-list nil)
 
 ;; Name of the directory containing files of Unicode Character Database.
@@ -923,11 +925,7 @@ is the character itself.")))
               (dotimes (i (length vec))
                 (dolist (elt (aref vec i))
                   (if (symbolp elt)
-                      (let ((slot (assq elt word-list)))
-                        (if slot
-                            (setcdr slot (1+ (cdr slot)))
-                          (setcdr word-list
-                                  (cons (cons elt 1) (cdr word-list))))))))
+                      (cl-incf (alist-get elt (cdr word-list) 0)))))
               (set-char-table-range table (cons start limit) vec))))))
     (setq word-list (sort (cdr word-list)
                           #'(lambda (x y) (> (cdr x) (cdr y)))))