[elpa] externals/pyim b0b8cb6 2/3: * pyim-process.el (pyim-process-auto-switch-english-input-p): Simplify.

[ELPA Syncer]

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

    * pyim-process.el (pyim-process-auto-switch-english-input-p): Simplify.
---
 pyim-process.el | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pyim-process.el b/pyim-process.el
index 52b8a2d..f6f7bd4 100644
--- a/pyim-process.el
+++ b/pyim-process.el
@@ -174,14 +174,13 @@
 (defun pyim-process-auto-switch-english-input-p ()
   "判断是否 *根据环境自动切换* 为英文输入模式，这个函数处理变量：
 `pyim-english-input-switch-functions'"
-  (let* ((func-or-list pyim-english-input-switch-functions))
-    (and (cl-some (lambda (x)
-                    (if (functionp x)
-                        (funcall x)
-                      nil))
-                  (cond ((functionp func-or-list) (list func-or-list))
-                        ((listp func-or-list) func-or-list)
-                        (t nil))))))
+  (let ((func-or-list pyim-english-input-switch-functions))
+    (cl-some (lambda (x)
+               (when (functionp x)
+                 (funcall x)))
+             (cond ((functionp func-or-list) (list func-or-list))
+                   ((listp func-or-list) func-or-list)
+                   (t nil)))))
 
 (defun pyim-process-force-input-chinese-p ()
   "判断是否强制输入中文，这个函数主要处理变量：