[elpa] externals/pyim 5a8be7f327 37/58: Sort pyim-indicator.el

[ELPA Syncer]

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

    Sort pyim-indicator.el
---
 pyim-indicator.el | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/pyim-indicator.el b/pyim-indicator.el
index 5854872c03..88b41082e8 100644
--- a/pyim-indicator.el
+++ b/pyim-indicator.el
@@ -93,6 +93,18 @@ timer 实现。"
 
 (add-hook 'pyim-process-start-daemon-hook #'pyim-indicator-start-daemon)
 
+(defun pyim-indicator--daemon-function ()
+  "`pyim-indicator-daemon' 内部使用的函数。"
+  (while-no-input
+    (redisplay)
+    (ignore-errors
+      (let ((chinese-input-p
+             (and (functionp pyim-indicator--daemon-function-argument)
+                  (funcall pyim-indicator--daemon-function-argument))))
+        (dolist (indicator pyim-indicator-list)
+          (when (functionp indicator)
+            (funcall indicator current-input-method chinese-input-p)))))))
+
 (defun pyim-indicator-stop-daemon ()
   "Stop indicator daemon."
   (interactive)
@@ -111,31 +123,11 @@ timer 实现。"
 
 (add-hook 'pyim-process-stop-daemon-hook #'pyim-indicator-stop-daemon)
 
-(defun pyim-indicator--daemon-function ()
-  "`pyim-indicator-daemon' 内部使用的函数。"
-  (while-no-input
-    (redisplay)
-    (ignore-errors
-      (let ((chinese-input-p
-             (and (functionp pyim-indicator--daemon-function-argument)
-                  (funcall pyim-indicator--daemon-function-argument))))
-        (dolist (indicator pyim-indicator-list)
-          (when (functionp indicator)
-            (funcall indicator current-input-method chinese-input-p)))))))
-
 (defun pyim-indicator--revert-cursor-color ()
   "将 cursor 颜色重置到 pyim 启动之前的状态。"
   (when pyim-indicator--original-cursor-color
     (set-cursor-color pyim-indicator--original-cursor-color)))
 
-(defun pyim-indicator--update-mode-line ()
-  "更新 mode-line."
-  (unless (eq pyim-indicator--last-input-method-title
-              current-input-method-title)
-    (force-mode-line-update)
-    (setq pyim-indicator--last-input-method-title
-          current-input-method-title)))
-
 (defun pyim-indicator-with-cursor-color (input-method chinese-input-p)
   "Pyim 自带的 indicator, 通过光标颜色来显示输入状态。"
   (if (not (equal input-method "pyim"))
@@ -173,6 +165,14 @@ timer 实现。"
       (setq current-input-method-title (nth 1 
pyim-indicator-modeline-string))))
   (pyim-indicator--update-mode-line))
 
+(defun pyim-indicator--update-mode-line ()
+  "更新 mode-line."
+  (unless (eq pyim-indicator--last-input-method-title
+              current-input-method-title)
+    (force-mode-line-update)
+    (setq pyim-indicator--last-input-method-title
+          current-input-method-title)))
+
 ;; * Footer
 (provide 'pyim-indicator)