[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/pyim 1aeddb6172 33/35: pyim-process-merge-candidates ->
From: |
ELPA Syncer |
Subject: |
[elpa] externals/pyim 1aeddb6172 33/35: pyim-process-merge-candidates -> pyim-process--merge-candidates |
Date: |
Fri, 24 Jun 2022 08:58:08 -0400 (EDT) |
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"))))
- [elpa] externals/pyim 93e54a0783 23/35: pyim-process-candidates-last -> pyim-process--candidates-last, (continued)
- [elpa] externals/pyim 93e54a0783 23/35: pyim-process-candidates-last -> pyim-process--candidates-last, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim e264cbe5f5 02/35: pyim-preview-delete-overlay -> pyim-preview--delete-overlay, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 3454118ea9 08/35: pyim-dhashcache-init* -> pyim-dhashcache--init*, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 91ffc476b8 11/35: pyim-dhashcache-get* -> pyim-dhashcache--get*, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim e5920bae41 28/35: pyim-process-auto-select -> pyim-process--auto-select, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 93b372c8f9 01/35: pyim-preview-setup-overlay -> pyim-preview--setup-overlay, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 73ee676657 04/35: pyim-preview-delete-string -> pyim-preview--delete-string, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 9a6073f5f4 17/35: pyim-dhashcache-pinyin-string< -> pyim-dhashcache--pinyin-string<, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 46eaaa937d 10/35: pyim-dhashcache-insert* -> pyim-dhashcache--insert*, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim d8f2e8b6d6 18/35: Add comment to pyim-dhashcache.el, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 1aeddb6172 33/35: pyim-process-merge-candidates -> pyim-process--merge-candidates,
ELPA Syncer <=
- [elpa] externals/pyim d42cc01d44 13/35: pyim-dhashcache-calculate-priority -> pyim-dhashcache--calculate-priority, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim d247ac664e 03/35: pyim-preview-refresh -> pyim-preview--refresh, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim b4f252016c 16/35: pyim-dhashcache-export* -> pyim-dhashcache--export*, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 9da901bf0f 15/35: pyim-dhashcache-save* -> pyim-dhashcache--save*, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 4005949cce 21/35: pyim-process-run-delay-timer -> pyim-process--run-delay-timer, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 461b9bcc0a 22/35: pyim-process-imobjs -> pyim-process--imobjs, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 30bc394852 25/35: pyim-process-candidates -> pyim-process--candidates, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim b49d1348de 31/35: pyim-process-run-delay -> pyim-process--run-delay, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim c58b3e572b 30/35: pyim-process-autoselector-find-result -> pyim-process--autoselector-find-result, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 63f5edffb2 27/35: pyim-process-input-chinese-predicate-2 -> pyim-process--input-chinese-predicate-2, ELPA Syncer, 2022/06/24