branch: externals/pyim commit 47f6757599628939f61750023987b6cf28d423e0 Author: Feng Shu <tuma...@163.com> Commit: Feng Shu <tuma...@163.com>
Fix Warning: Lexical argument shadows the dynamic variable current-input-method --- pyim-indicator.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pyim-indicator.el b/pyim-indicator.el index 41d3e78..4561199 100644 --- a/pyim-indicator.el +++ b/pyim-indicator.el @@ -113,9 +113,9 @@ Indicator 用于显示输入法当前输入状态(英文还是中文)。" (setq pyim-indicator-last-input-method-title current-input-method-title))) -(defun pyim-indicator-with-cursor-color (current-input-method chinese-input-p) +(defun pyim-indicator-with-cursor-color (input-method chinese-input-p) "Pyim 自带的 indicator, 通过光标颜色来显示输入状态。" - (if (not (equal current-input-method "pyim")) + (if (not (equal input-method "pyim")) ;; 大多数情况是因为用户切换 buffer, 新 buffer 中 ;; pyim 没有启动,重置 cursor 颜色。 (set-cursor-color pyim-indicator-original-cursor-color) @@ -129,20 +129,20 @@ Indicator 用于显示输入法当前输入状态(英文还是中文)。" (message "Pyim-indicator: 用户更改了背景颜色,将光标颜色设置为蓝色,便于区别。") "blue")))))) -(defun pyim-indicator-with-modeline (current-input-method chinese-input-p) +(defun pyim-indicator-with-modeline (input-method chinese-input-p) "Pyim 自带的 indicator, 使用 mode-line 来显示输入状态。" - (when (equal current-input-method "pyim") + (when (equal input-method "pyim") (if chinese-input-p (setq current-input-method-title (nth 0 pyim-indicator-modeline-string)) (setq current-input-method-title (nth 1 pyim-indicator-modeline-string)))) (pyim-indicator-update-mode-line)) -(defun pyim-indicator-with-posframe (current-input-method chinese-input-p) +(defun pyim-indicator-with-posframe (input-method chinese-input-p) "Pyim 自带的 indicator, 通过 posframe 来显示输入状态。" (when (posframe-workable-p) (let ((buffer " *pyim-indicator*") (posframe-mouse-banish nil)) - (if (not (equal current-input-method "pyim")) + (if (not (equal input-method "pyim")) (posframe-hide buffer) (if chinese-input-p (posframe-show buffer