[elpa] externals/pyim d7952b08ef 03/26: Add pyim-page-plan-to-select-word

[ELPA Syncer]

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

    Add pyim-page-plan-to-select-word
---
 pyim-page.el | 9 ++++-----
 pyim.el      | 6 ++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/pyim-page.el b/pyim-page.el
index 74973763cb..f6bdfba445 100644
--- a/pyim-page.el
+++ b/pyim-page.el
@@ -562,17 +562,16 @@ pyim-page 的核心的功能，为此增加代码的复杂度和测试的难度
          result)))
     (string-join (nreverse result) (or separator ""))))
 
-(defun pyim-page-get-candidate-position-by-numeric-key (num-key)
-  "根据 NUM-KEY 获取一个有效的 candidate position.
-
-如果获取不到，返回 nil."
+(defun pyim-page-plan-to-select-word (num-key)
+  "按照 NUM-KEY 预选词条，如果预选不成功，则返回 nil."
   (let ((index (if (numberp num-key)
                    (- num-key 1)
                  0))
         (end (pyim-page--end)))
     (when (= index -1) (setq index 9))
     (when (<= (+ index (pyim-page--start)) end)
-      (+ (pyim-page--start) index))))
+      (pyim-process-plan-to-select-word
+       (+ (pyim-page--start) index)))))
 
 (defun pyim-page-next-page (arg)
   "Pyim page 翻页命令."
diff --git a/pyim.el b/pyim.el
index d9869d5eae..1ff8c99ad6 100644
--- a/pyim.el
+++ b/pyim.el
@@ -630,10 +630,8 @@ FILE 的格式与 `pyim-dcache-export' 生成的文件格式相同，
           (progn
             (pyim-process-outcome-handle 'last-char)
             (pyim-process-terminate))
-        (let ((position (pyim-page-get-candidate-position-by-numeric-key num)))
-          (when position
-            (pyim-process-plan-to-select-word position)
-            (pyim-select-word))))
+        (when (pyim-page-plan-to-select-word num)
+          (pyim-select-word)))
     ;; 有些输入法使用数字键编码，这种情况下，数字键就
     ;; 不能用来选词了。
     (call-interactively #'pyim-self-insert-command)))