From 99a545062367a2f80d69482df0bb266b358ffa54 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sun, 2 Jul 2017 10:04:02 -0400 Subject: [PATCH v1 6/6] * lisp/international/ja-dic-cnv.el (skkdic-convert-okuri-nasi): Cleanup. time make -C leim -B ../../leim/../lisp/leim/ja-dic/ja-dic.el real 0m46.145s user 0m45.607s sys 0m0.460s --- lisp/international/ja-dic-cnv.el | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el index 63eede093d..6d2753bbf5 100644 --- a/lisp/international/ja-dic-cnv.el +++ b/lisp/international/ja-dic-cnv.el @@ -298,25 +298,19 @@ skkdic-convert-okuri-nasi (with-current-buffer buf (insert ";; Setting okuri-nasi entries.\n" "(skkdic-set-okuri-nasi\n") - (let ((l (nreverse skkdic-okuri-nasi-entries)) - (progress (make-progress-reporter "Processing OKURI-NASI entries" + (let ((progress (make-progress-reporter "Processing OKURI-NASI entries" 0 skkdic-okuri-nasi-entries-count nil 10)) (count 0)) - (while l - (let ((kana (car (car l))) - (candidates (cdr (car l)))) - (setq count (1+ count)) - (progress-reporter-update progress count) - (if (setq candidates - (skkdic-reduced-candidates skkbuf kana candidates)) - (progn - (insert "\"" kana) - (while candidates - (insert " " (car candidates)) - (setq candidates (cdr candidates))) - (insert "\"\n")))) - (setq l (cdr l))) + (pcase-dolist (`(,kana . ,candidates) + (nreverse skkdic-okuri-nasi-entries)) + (setq count (1+ count)) + (progress-reporter-update progress count) + (when (setq candidates + (skkdic-reduced-candidates skkbuf kana candidates)) + (insert "\"" kana " " + (mapconcat #'identity candidates " ") + "\"\n"))) (progress-reporter-done progress)) (insert ")\n\n"))) -- 2.11.1