branch: externals/pyim commit 3d3044361ea72255def0b1d545e14e27b9f4d1b2 Author: Feng Shu <tuma...@163.com> Commit: Feng Shu <tuma...@163.com>
Remove pyim-process-update-last-candidates --- pyim-process.el | 13 ++++++------- pyim.el | 1 - 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pyim-process.el b/pyim-process.el index 7201659405..34b9881cb2 100644 --- a/pyim-process.el +++ b/pyim-process.el @@ -180,7 +180,7 @@ imobj 组合构成在一起,构成了 imobjs 这个概念。比如: (defvar pyim-process--candidates nil "所有备选词条组成的列表.") -(defvar pyim-process--candidates-last nil +(defvar pyim-process--last-candidates nil "上一轮备选词条列表,这个变量主要用于 autoselector 机制.") (defvar pyim-process--word-position nil @@ -224,10 +224,7 @@ imobj 组合构成在一起,构成了 imobjs 这个概念。比如: pyim-process--candidates) (defun pyim-process-get-last-candidates () - pyim-process--candidates-last) - -(defun pyim-process-update-last-candidates () - (setq pyim-process--candidates-last pyim-process--candidates)) + pyim-process--last-candidates) ;; ** pyim-input-method 核心函数 (defvar pyim-mode-map) @@ -441,6 +438,8 @@ imobj 组合构成在一起,构成了 imobjs 这个概念。比如: (setq entered-to-translate (pyim-entered-get 'point-before)) (setq pyim-process--imobjs (pyim-imobjs-create entered-to-translate scheme)) + (setq pyim-process--last-candidates + pyim-process--candidates) (setq pyim-process--candidates (or (delete-dups (pyim-candidates-create pyim-process--imobjs scheme)) (list entered-to-translate))) @@ -465,7 +464,7 @@ imobj 组合构成在一起,构成了 imobjs 这个概念。比如: (setq pyim-process--code-criteria nil) (setq pyim-process--force-input-chinese nil) (setq pyim-process--candidates nil) - (setq pyim-process--candidates-last nil) + (setq pyim-process--last-candidates nil) (pyim-process--run-delay-timer-reset) (pyim-process-ui-hide)) @@ -507,7 +506,7 @@ imobj 组合构成在一起,构成了 imobjs 这个概念。比如: select-current-word) :replace-with)) (candidates (if select-last-word - pyim-process--candidates-last + pyim-process--last-candidates pyim-process--candidates)) (pyim-process--candidates (if (and str (stringp str)) diff --git a/pyim.el b/pyim.el index 2c52aaa5f5..8e53a80e22 100644 --- a/pyim.el +++ b/pyim.el @@ -257,7 +257,6 @@ REFRESH-COMMON-DCACHE 已经废弃,不要再使用了。" (defun pyim-self-insert-command () "Pyim 默认的 self-insert-command." (interactive "*") - (pyim-process-update-last-candidates) (cond ((pyim-process-input-chinese-p) (pyim-process-with-entered-buffer