[elpa] externals/pyim 24cbb3ade9 21/22: pyim-schemes -> pyim-scheme--all-schemes

[ELPA Syncer]

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

    pyim-schemes -> pyim-scheme--all-schemes
---
 pyim-dhashcache.el  |  2 +-
 pyim-scheme.el      | 12 ++++++------
 tests/pyim-tests.el |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pyim-dhashcache.el b/pyim-dhashcache.el
index 4c0f20b03d..adfb21bdab 100644
--- a/pyim-dhashcache.el
+++ b/pyim-dhashcache.el
@@ -684,7 +684,7 @@ pyim 使用的词库文件是简单的文本文件，编码 *强制* 为 \\='utf
                     (code-prefix-history (pyim-scheme-code-prefix-history 
scheme)))
                 (when code-prefix-history
                   (cons code-prefix-history code-prefix))))
-            pyim-schemes))))
+            pyim-scheme--all-schemes))))
 
 ;; ** 保存 dhashcache 相关函数
 (cl-defmethod pyim-dcache-save-caches
diff --git a/pyim-scheme.el b/pyim-scheme.el
index 39cad6c8dd..1f2d4945c5 100644
--- a/pyim-scheme.el
+++ b/pyim-scheme.el
@@ -50,7 +50,7 @@
 
 (pyim-register-local-variables '(pyim-scheme--enable-assistant-p))
 
-(defvar pyim-schemes nil
+(defvar pyim-scheme--all-schemes nil
   "Pyim 支持的所有拼音方案.")
 
 (cl-defstruct (pyim-scheme
@@ -105,7 +105,7 @@
 ;;;###autoload
 (defun pyim-default-scheme (&optional scheme-name)
   (interactive)
-  (let* ((scheme-names (mapcar #'pyim-scheme-name pyim-schemes))
+  (let* ((scheme-names (mapcar #'pyim-scheme-name pyim-scheme--all-schemes))
          (scheme-name
           (or scheme-name
               (intern (completing-read "PYIM: 将 pyim-default-scheme 设置为：" 
scheme-names)))))
@@ -118,7 +118,7 @@
       nil)))
 
 (defun pyim-scheme-add (scheme-config)
-  "Add SCHEME to `pyim-schemes'."
+  "Add SCHEME to `pyim-scheme--all-schemes'."
   (if (listp scheme-config)
       (let* ((scheme-name (car scheme-config))
              (scheme-type (plist-get (cdr scheme-config) :class))
@@ -132,7 +132,7 @@
              schemes update-p)
         (when (and (symbolp scheme-name)
                    (functionp func))
-          (dolist (x pyim-schemes)
+          (dolist (x pyim-scheme--all-schemes)
             (push (if (equal (pyim-scheme-name x) scheme-name)
                       (progn (setq update-p t)
                              scheme)
@@ -140,7 +140,7 @@
                   schemes))
           (unless update-p
             (push scheme schemes))
-          (setq pyim-schemes (reverse schemes))))
+          (setq pyim-scheme--all-schemes (reverse schemes))))
     (message "PYIM: Invalid pyim scheme config!")))
 
 (defun pyim-scheme-current ()
@@ -157,7 +157,7 @@
     (cl-find-if
      (lambda (x)
        (equal (pyim-scheme-name x) scheme-name))
-     pyim-schemes)))
+     pyim-scheme--all-schemes)))
 
 (defun pyim-scheme-assistant-status ()
   pyim-scheme--enable-assistant-p)
diff --git a/tests/pyim-tests.el b/tests/pyim-tests.el
index 4e5aad8d8e..67fc7aaab2 100644
--- a/tests/pyim-tests.el
+++ b/tests/pyim-tests.el
@@ -85,8 +85,8 @@
 (when noninteractive
   (pyim-tests-noninteractive-init))
 
-;; ** pyim-schemes 相关单元测试
-(ert-deftest pyim-tests-pyim-schemes ()
+;; ** pyim-scheme--all-schemes 相关单元测试
+(ert-deftest pyim-tests-pyim-scheme--all-schemes ()
   (let ((pyim-default-scheme 'wubi))
     (should (equal (pyim-scheme-name
                     (pyim-scheme-current))
@@ -122,7 +122,7 @@
                  'wubi)))
 
 (ert-deftest pyim-tests-pyim-scheme-add ()
-  (let ((pyim-schemes nil))
+  (let ((pyim-scheme--all-schemes nil))
     (pyim-scheme-add
      '(quanpin
        :document "test1"
@@ -149,7 +149,7 @@
 
     (pyim-scheme-add "error")
 
-    (should (equal (mapcar #'pyim-scheme-document pyim-schemes)
+    (should (equal (mapcar #'pyim-scheme-document pyim-scheme--all-schemes)
                    '("test2" "test3")))))
 
 ;; ** pyim-common 相关单元测试