[elpa] externals/pyim 3e98aba 4/7: Move some variable.

[ELPA Syncer]

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

    Move some variable.
---
 pyim-candidates.el |  6 ++++--
 pyim-process.el    | 17 ++++++++++++++++-
 pyim.el            | 21 +--------------------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/pyim-candidates.el b/pyim-candidates.el
index b2ea757..ca2d33d 100644
--- a/pyim-candidates.el
+++ b/pyim-candidates.el
@@ -36,6 +36,10 @@
   "Candidates of pyim."
   :group 'pyim)
 
+(defcustom pyim-enable-shortcode t
+  "启用输入联想词功能."
+  :type 'boolean)
+
 (defvar pyim-candidates nil
   "所有备选词条组成的列表.")
 
@@ -84,8 +88,6 @@ IMOBJS 获得候选词条。"
       (when (car result)
         result))))
 
-(defvar pyim-enable-shortcode)
-
 (defun pyim-candidates-create:quanpin (imobjs scheme-name &optional async)
   "`pyim-candidates-create' 处理全拼输入法的函数."
   (unless async
diff --git a/pyim-process.el b/pyim-process.el
index afa512c..417fc22 100644
--- a/pyim-process.el
+++ b/pyim-process.el
@@ -52,6 +52,20 @@
 运行结果为 t 时，pyim 开启英文输入功能。"
   :type 'symbol)
 
+(defcustom pyim-magic-converter nil
+  "将 “待选词条” 在 “上屏” 之前自动转换为其他字符串.
+这个功能可以实现“简转繁”，“输入中文得到英文”之类的功能。"
+  :type 'boolean)
+
+(defvar pyim-input-ascii nil
+  "是否开启 pyim 英文输入模式.")
+
+(defvar pyim-force-input-chinese nil
+  "是否强制开启中文输入模式.
+
+这个变量只用于 `pyim-convert-string-at-point', 不要
+在其它地方使用。")
+
 (defvar pyim-process-translating nil
   "记录是否在转换状态.")
 
@@ -66,7 +80,8 @@
   "异步处理 intered 时时，使用的 timer.")
 
 (pyim-register-local-variables
- '(pyim-process-translating
+ '(pyim-input-ascii
+   pyim-process-translating
    pyim-process-last-created-word))
 
 (defun pyim-process-init-dcaches (&optional force save-caches)
diff --git a/pyim.el b/pyim.el
index b9fd261..7a65e85 100644
--- a/pyim.el
+++ b/pyim.el
@@ -45,10 +45,6 @@
   "Pyim is a Chinese input method support quanpin, shuangpin, wubi and 
cangjie."
   :group 'leim)
 
-(defcustom pyim-enable-shortcode t
-  "启用输入联想词功能."
-  :type 'boolean)
-
 (define-obsolete-variable-alias 'pyim-page-select-finish-hook 
'pyim-select-finish-hook "4.0")
 (defcustom pyim-select-finish-hook nil
   "Pyim 选词完成时运行的 hook."
@@ -73,23 +69,9 @@ Tip: 用户也可以利用 `pyim-outcome-trigger-function-default' 函数
 编码的输入法。"
   :type 'boolean)
 
-(defcustom pyim-magic-converter nil
-  "将 “待选词条” 在 “上屏” 之前自动转换为其他字符串.
-这个功能可以实现“简转繁”，“输入中文得到英文”之类的功能。"
-  :type 'boolean)
-
 ;;;###autoload
 (defvar pyim-titles '("PYIM " "PYIM-EN " "PYIM-AU ") "Pyim 在 mode-line 
中显示的名称.")
 
-(defvar pyim-input-ascii nil
-  "是否开启 pyim 英文输入模式.")
-
-(defvar pyim-force-input-chinese nil
-  "是否强制开启中文输入模式.
-
-这个变量只用于 `pyim-convert-string-at-point', 不要
-在其它地方使用。")
-
 (defvar pyim-load-hook nil)
 (defvar pyim-active-hook nil)
 (defvar pyim-inactive-hook nil)
@@ -138,8 +120,7 @@ Tip: 用户也可以利用 `pyim-outcome-trigger-function-default' 函数
   "Pyim 的 Keymap.")
 
 (pyim-register-local-variables
- '(pyim-input-ascii
-   input-method-function
+ '(input-method-function
    inactivate-current-input-method-function
    describe-current-input-method-function))