[elpa] externals/pyim b96b079 2/3: * pyim.el (pyim-select-word-by-number): simplify.

[ELPA Syncer]

branch: externals/pyim
commit b96b0791ceed7b8e6ed816064e899ddb8c458de0
Author: Feng Shu <tumashu@163.com>
Commit: Feng Shu <tumashu@163.com>

    * pyim.el (pyim-select-word-by-number): simplify.
---
 pyim.el | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pyim.el b/pyim.el
index 2024785..cd3115b 100644
--- a/pyim.el
+++ b/pyim.el
@@ -95,15 +95,19 @@ Tip: 用户也可以利用 `pyim-outcome-trigger-function-default' 函数
     (while (< i 256)
       (define-key map (vector i) #'pyim-self-insert-command)
       (setq i (1+ i)))
-    (dolist (i (number-sequence ?0 ?9))
-      (define-key map (char-to-string i) #'pyim-select-word-by-number))
+    (dolist (i (number-sequence 0 9))
+      (define-key map (kbd (number-to-string i))
+                  (lambda ()
+                    (interactive)
+                    (pyim-select-word-by-number i))))
     (dolist (x '(("<f1>" . 1)
                  ("<f2>" . 2)
                  ("<f3>" . 3)
                  ("<f4>" . 4)))
-      (define-key map (kbd (car x)) (lambda ()
-                                      (interactive)
-                                      (pyim-select-subword-by-number (cdr 
x)))))
+      (define-key map (kbd (car x))
+                  (lambda ()
+                    (interactive)
+                    (pyim-select-subword-by-number (cdr x)))))
     (define-key map " " #'pyim-select-word)
     (define-key map (kbd "C-SPC") #'pyim-select-word-simple)
     (define-key map [backspace] #'pyim-delete-backward-char)
@@ -619,9 +623,9 @@ FILE 的格式与 `pyim-dcache-export' 生成的文件格式相同，
             (pyim-process-terminate))
         (let ((index (if (numberp n)
                          (- n 1)
-                       (- last-command-event ?1)))
+                       0))
               (end (pyim-page-end)))
-          (if (= index -1) (setq index 9) nil)
+          (when (= index -1) (setq index 9))
           (if (> (+ index (pyim-page-start)) end)
               (pyim-page-refresh)
             (pyim-process-set-candidate-position