[elpa] externals/pyim 885a8a5627 4/6: Move pyim-process-get/last-candidates

[ELPA Syncer]

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

    Move pyim-process-get/last-candidates
---
 pyim-process.el | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pyim-process.el b/pyim-process.el
index e16d780ad5..0b3600392e 100644
--- a/pyim-process.el
+++ b/pyim-process.el
@@ -217,12 +217,6 @@ imobj 组合构成在一起，构成了 imobjs 这个概念。比如：
 (defun pyim-process-register-self-insert-command (command)
   (cl-pushnew command pyim-process--self-insert-commands))
 
-(defun pyim-process-get-candidates ()
-  pyim-process--candidates)
-
-(defun pyim-process-get-last-candidates ()
-  pyim-process--last-candidates)
-
 ;; ** pyim-input-method 核心函数
 (defvar pyim-mode-map)
 
@@ -508,9 +502,10 @@ imobj 组合构成在一起，构成了 imobjs 这个概念。比如：
                                  select-last-word
                                select-current-word)
                              :replace-with))
-             (candidates (if select-last-word
-                             pyim-process--last-candidates
-                           pyim-process--candidates))
+             (candidates
+              (if select-last-word
+                  (pyim-process-get-last-candidates)
+                (pyim-process-get-candidates)))
              (pyim-process--candidates
               (if (and str (stringp str))
                   (list str)
@@ -550,6 +545,12 @@ imobj 组合构成在一起，构成了 imobjs 这个概念。比如：
                 (equal (plist-get x :select) type))
               results))
 
+(defun pyim-process-get-last-candidates ()
+  pyim-process--last-candidates)
+
+(defun pyim-process-get-candidates ()
+  pyim-process--candidates)
+
 (defun pyim-process-ui-refresh (&optional hightlight-current)
   "刷新 pyim 相关 UI."
   (run-hook-with-args 'pyim-process-ui-refresh-hook hightlight-current))