emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/pyim 6e5f4a369c 3/4: Move pyim-cregexp-char-level-num.


From: ELPA Syncer
Subject: [elpa] externals/pyim 6e5f4a369c 3/4: Move pyim-cregexp-char-level-num.
Date: Wed, 22 Jun 2022 02:57:55 -0400 (EDT)

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

    Move pyim-cregexp-char-level-num.
---
 pyim-cregexp.el | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pyim-cregexp.el b/pyim-cregexp.el
index be81fdac37..f54afa12f6 100644
--- a/pyim-cregexp.el
+++ b/pyim-cregexp.el
@@ -46,12 +46,6 @@
 将使用这个 scheme."
   :type 'symbol)
 
-(defun pyim-cregexp-char-level-num (num)
-  "根据 NUM 返回一个有效的常用汉字级别。"
-  (if (numberp num)
-      (max (min num 4) 1)
-    4))
-
 (defun pyim-cregexp-build (string &optional char-level-num chinese-only)
   "根据 STRING 构建一个中文 regexp.
 
@@ -102,15 +96,22 @@ regexp, 所以搜索单字的时候一般可以搜到生僻字,但搜索句子
 (defun pyim-cregexp-create-valid-cregexp-from-string
     (string scheme &optional char-level-num chinese-only)
   "从 STRING 创建一个有效的搜索中文的 regexp."
-  (let ((num (pyim-cregexp-char-level-num char-level-num))
+  (let ((char-level-num
+         (pyim-cregexp-char-level-num char-level-num))
         rx-string)
     (while (not (pyim-cregexp-valid-p rx-string))
       (setq rx-string
             (pyim-cregexp-create-beautiful-cregexp-from-string
-             string scheme num chinese-only))
-      (setq num (1- num)))
+             string scheme char-level-num chinese-only))
+      (setq char-level-num (1- char-level-num)))
     rx-string))
 
+(defun pyim-cregexp-char-level-num (num)
+  "根据 NUM 返回一个有效的常用汉字级别。"
+  (if (numberp num)
+      (max (min num 4) 1)
+    4))
+
 (defun pyim-cregexp-valid-p (cregexp)
   "Return t when cregexp is a valid regexp."
   (and cregexp



reply via email to

[Prev in Thread] Current Thread [Next in Thread]