[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/pyim 63f5edffb2 27/35: pyim-process-input-chinese-predi
From: |
ELPA Syncer |
Subject: |
[elpa] externals/pyim 63f5edffb2 27/35: pyim-process-input-chinese-predicate-2 -> pyim-process--input-chinese-predicate-2 |
Date: |
Fri, 24 Jun 2022 08:58:08 -0400 (EDT) |
branch: externals/pyim
commit 63f5edffb24c5143056ef614e985ad8706a72d74
Author: Feng Shu <tumashu@163.com>
Commit: Feng Shu <tumashu@163.com>
pyim-process-input-chinese-predicate-2 ->
pyim-process--input-chinese-predicate-2
---
pyim-process.el | 4 ++--
tests/pyim-tests.el | 18 +++++++++---------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pyim-process.el b/pyim-process.el
index e79e59cbc5..3bfbb13605 100644
--- a/pyim-process.el
+++ b/pyim-process.el
@@ -299,7 +299,7 @@ imobj 组合构成在一起,构成了 imobjs 这个概念。比如:
(rest-chars (pyim-scheme-rest-chars scheme))
(entered (pyim-entered-get 'point-before)))
(and (pyim-process--input-chinese-predicate-1)
- (pyim-process-input-chinese-predicate-2
+ (pyim-process--input-chinese-predicate-2
last-command-event entered first-chars rest-chars))))
(defun pyim-process--input-chinese-predicate-1 ()
@@ -308,7 +308,7 @@ imobj 组合构成在一起,构成了 imobjs 这个概念。比如:
(and (not pyim-process-input-ascii)
(not (pyim-process-auto-switch-english-input-p)))))
-(defun pyim-process-input-chinese-predicate-2 (event entered first-chars
rest-chars)
+(defun pyim-process--input-chinese-predicate-2 (event entered first-chars
rest-chars)
"`pyim-process-input-chinese-p' 内部函数,测试输入。"
(if (not (string< "" entered))
(member event (mapcar #'identity first-chars))
diff --git a/tests/pyim-tests.el b/tests/pyim-tests.el
index 5329b6e890..0f1c73158a 100644
--- a/tests/pyim-tests.el
+++ b/tests/pyim-tests.el
@@ -1988,34 +1988,34 @@ abc 这是")))
(lambda () nil)))
(should (pyim-process--input-chinese-predicate-1))))
-(ert-deftest pyim-tests-pyim-process-input-chinese-predicate-2 ()
- (should (pyim-process-input-chinese-predicate-2 ?a "" "abc" "def"))
- (should-not (pyim-process-input-chinese-predicate-2 ?d "" "abc" "def"))
- (should (pyim-process-input-chinese-predicate-2 ?d "a" "abc" "def"))
- (should-not (pyim-process-input-chinese-predicate-2 ?g "a" "abc" "def")))
+(ert-deftest pyim-tests-pyim-process--input-chinese-predicate-2 ()
+ (should (pyim-process--input-chinese-predicate-2 ?a "" "abc" "def"))
+ (should-not (pyim-process--input-chinese-predicate-2 ?d "" "abc" "def"))
+ (should (pyim-process--input-chinese-predicate-2 ?d "a" "abc" "def"))
+ (should-not (pyim-process--input-chinese-predicate-2 ?g "a" "abc" "def")))
(ert-deftest pyim-tests-pyim-process-input-chinese-p ()
(cl-letf (((symbol-function 'pyim-process--input-chinese-predicate-1)
(lambda (&rest _) nil))
- ((symbol-function 'pyim-process-input-chinese-predicate-2)
+ ((symbol-function 'pyim-process--input-chinese-predicate-2)
(lambda (&rest _) nil)))
(should-not (pyim-process-input-chinese-p)))
(cl-letf (((symbol-function 'pyim-process--input-chinese-predicate-1)
(lambda (&rest _) t))
- ((symbol-function 'pyim-process-input-chinese-predicate-2)
+ ((symbol-function 'pyim-process--input-chinese-predicate-2)
(lambda (&rest _) nil)))
(should-not (pyim-process-input-chinese-p)))
(cl-letf (((symbol-function 'pyim-process--input-chinese-predicate-1)
(lambda (&rest _) nil))
- ((symbol-function 'pyim-process-input-chinese-predicate-2)
+ ((symbol-function 'pyim-process--input-chinese-predicate-2)
(lambda (&rest _) t)))
(should-not (pyim-process-input-chinese-p)))
(cl-letf (((symbol-function 'pyim-process--input-chinese-predicate-1)
(lambda (&rest _) t))
- ((symbol-function 'pyim-process-input-chinese-predicate-2)
+ ((symbol-function 'pyim-process--input-chinese-predicate-2)
(lambda (&rest _) t)))
(should (pyim-process-input-chinese-p))))
- [elpa] externals/pyim 1aeddb6172 33/35: pyim-process-merge-candidates -> pyim-process--merge-candidates, (continued)
- [elpa] externals/pyim 1aeddb6172 33/35: pyim-process-merge-candidates -> pyim-process--merge-candidates, ELPA Syncer, 2022/06/24
- [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 <=
- [elpa] externals/pyim 11c6f46974 34/35: pyim-process-handle-candidates-async -> pyim-process--handle-candidates-async, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 24c0bb2240 32/35: pyim-process-handle-candidates-limit-time -> pyim-process--handle-candidates-limit-time, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 8755295cb4 20/35: pyim-process-code-criteria -> pyim-process--code-criteria, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 404add9758 29/35: pyim-process-autoselector-results -> pyim-process--autoselector-results, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim f073ba0fb8 35/35: pyim-process-punctuation-full-width-p -> pyim-process--punctuation-full-width-p, ELPA Syncer, 2022/06/24