[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/pyim 70a2d9a754 51/58: Add pyim-pinyin-valid-shuangpin-
From: |
ELPA Syncer |
Subject: |
[elpa] externals/pyim 70a2d9a754 51/58: Add pyim-pinyin-valid-shuangpin-p |
Date: |
Fri, 24 Jun 2022 06:57:56 -0400 (EDT) |
branch: externals/pyim
commit 70a2d9a754a31f00432476bf10136134fc24be87
Author: Feng Shu <tumashu@163.com>
Commit: Feng Shu <tumashu@163.com>
Add pyim-pinyin-valid-shuangpin-p
---
pyim-imobjs.el | 4 ++--
pyim-pinyin.el | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/pyim-imobjs.el b/pyim-imobjs.el
index af45c79759..f55c51564a 100644
--- a/pyim-imobjs.el
+++ b/pyim-imobjs.el
@@ -116,8 +116,8 @@
(let* ((y (concat sp-sm (or sp-ym " ")))
(z (cadr (assoc y keymaps)))
(py (if z (list "" z sp-sm sp-ym) (list sm x sp-sm sp-ym))))
- (unless (string-match-p pyim-pinyin-shuangpin-invalid-pinyin-regexp
- (concat (nth 0 py) (nth 1 py)))
+ (when (pyim-pinyin-valid-shuangpin-p
+ (concat (nth 0 py) (nth 1 py)))
(push py one-word-pinyins))))
(when (and one-word-pinyins (> (length one-word-pinyins) 0))
diff --git a/pyim-pinyin.el b/pyim-pinyin.el
index 4f07414245..c382d8c0c2 100644
--- a/pyim-pinyin.el
+++ b/pyim-pinyin.el
@@ -55,7 +55,7 @@
'("a" "o" "e" "ai" "ei" "ui" "ao" "ou" "er" "an" "en"
"ang" "eng"))
-(defconst pyim-pinyin-shuangpin-invalid-pinyin-regexp
+(defconst pyim-pinyin--shuangpin-invalid-pinyin-regexp
(format "^\\(%s\\)$"
(string-join
'("[qtghkzcsdn]o"
@@ -178,6 +178,11 @@
(push `(,a ,b ,@(nthcdr 2 info)) result)))
(reverse result)))
+(defun pyim-pinyin-valid-shuangpin-p (shuangpin)
+ (not (string-match-p
+ pyim-pinyin--shuangpin-invalid-pinyin-regexp
+ shuangpin)))
+
;; * Footer
(provide 'pyim-pinyin)
- [elpa] externals/pyim 9cef8ad02e 36/58: pyim-indicator-select-color -> pyim-indicator--select-color, (continued)
- [elpa] externals/pyim 9cef8ad02e 36/58: pyim-indicator-select-color -> pyim-indicator--select-color, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 5a8be7f327 37/58: Sort pyim-indicator.el, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 4f4f3c8098 38/58: pyim-liberime-scheme -> pyim-liberime--scheme, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim e64c0be9e2 20/58: pyim-candidates-jianpin-words -> pyim-candidates--jianpin-words, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 9e006e703d 21/58: pyim-candidates-search-buffer -> pyim-candidates--search-buffer, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 4bb3a611cc 24/58: pyim-local-variable-list -> pyim--local-variable-list, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 76f67a8d9c 27/58: pyim-kill-emacs-hook-function -> pyim--kill-emacs-hook-function, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 25a704da4b 28/58: pyim-input-method-1 -> pyim--input-method, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 37812896c5 34/58: pyim-indicator-revert-cursor-color -> pyim-indicator--revert-cursor-color, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 80c81b88cf 48/58: pyim-pinyin-valid-charpy-p -> pyim-pinyin--valid-charpy-p, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 70a2d9a754 51/58: Add pyim-pinyin-valid-shuangpin-p,
ELPA Syncer <=
- [elpa] externals/pyim 894e4cd5e1 43/58: Remove pyim-pinyin-build-regexp, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 578d096ba9 44/58: pyim-pinyin-shenmu -> pyim-pinyin--shenmu, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim aef2a941f3 05/58: pyim-cregexp-create-beautiful-cregexp-from-string -> pyim-cregexp--create-beautiful-cregexp-from-string, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim a86cb9b606 47/58: pyim-pinyin-get-shenmu -> pyim-pinyin--get-shenmu, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim c604b1f4aa 55/58: pyim-pymap-py2cchar-cache2 -> pyim-pymap--py2cchar-cache2, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim c0798d5e4d 57/58: pyim-pymap-cchar2py-cache -> pyim-pymap--cchar2py-cache, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim c573694ae4 58/58: Update pyim-pymap-utils.el, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim f4074fc4ef 04/58: pyim-cregexp-valid-p -> pyim-cregexp--valid-p, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 291798d23d 09/58: pyim-cregexp-scheme -> pyim-cregexp--scheme, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim b243e7e8e7 15/58: pyim-isearch-search-fun -> pyim-isearch--search-fun, ELPA Syncer, 2022/06/24