[elpa] externals/pyim 1aeddb6172 33/35: pyim-process-merge-candidates -> pyim-process--merge-candidates

[ELPA Syncer]

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

    pyim-process-merge-candidates -> pyim-process--merge-candidates
---
 pyim-process.el     | 6 +++---
 tests/pyim-tests.el | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pyim-process.el b/pyim-process.el
index 1825b71222..7af0723716 100644
--- a/pyim-process.el
+++ b/pyim-process.el
@@ -450,10 +450,10 @@ imobj 组合构成在一起，构成了 imobjs 这个概念。比如：
                  pyim-process--imobjs scheme)))
     (when words
       (setq pyim-process--candidates
-            (pyim-process-merge-candidates words pyim-process--candidates))
+            (pyim-process--merge-candidates words pyim-process--candidates))
       (pyim-process-ui-refresh))))
 
-(defun pyim-process-merge-candidates (new-candidates old-candidates)
+(defun pyim-process--merge-candidates (new-candidates old-candidates)
   "将 OLD-CANDIDATES 和 NEW-CANDIDATES 合并的默认策略。"
   (remove nil (delete-dups
                `(,(car old-candidates)
@@ -472,7 +472,7 @@ imobj 组合构成在一起，构成了 imobjs 这个概念。比如：
                     (not (input-pending-p))
                     (equal (car async-return) pyim-process--imobjs))
            (setq pyim-process--candidates
-                 (pyim-process-merge-candidates (cdr async-return) 
pyim-process--candidates))
+                 (pyim-process--merge-candidates (cdr async-return) 
pyim-process--candidates))
            (pyim-process-ui-refresh)))))))
 
 (defun pyim-process-get-candidates ()
diff --git a/tests/pyim-tests.el b/tests/pyim-tests.el
index c1e92b8c69..cbdd6c54b7 100644
--- a/tests/pyim-tests.el
+++ b/tests/pyim-tests.el
@@ -2065,8 +2065,8 @@ abc 这是")))
     (should (equal result1 "result1"))
     (should (equal result2 "result2"))))
 
-(ert-deftest pyim-tests-pyim-process-merge-candidates ()
-  (should (equal (pyim-process-merge-candidates
+(ert-deftest pyim-tests-pyim-process--merge-candidates ()
+  (should (equal (pyim-process--merge-candidates
                   '("a" "b" "c") '("d" "e" "f" "a" "b"))
                  '("d" "a" "b" "c" "e" "f"))))