branch: externals/pyim
commit 835da2dfbc455c4b2b7b11d12be3626d734f201b
Author: Feng Shu <tuma...@163.com>
Commit: Feng Shu <tuma...@163.com>
pyim-probe: Do not use pyim-entered-get.
* pyim-probe.el (pyim-probe-dynamic-english)
(pyim-probe-auto-english, pyim-process-get-entered): Use
pyim-process-get-entered.
---
pyim-probe.el | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pyim-probe.el b/pyim-probe.el
index 3930d72ddc..e9479c6955 100644
--- a/pyim-probe.el
+++ b/pyim-probe.el
@@ -54,6 +54,7 @@
;;; Code:
;; * 代码 :code:
(require 'pyim-common)
+(require 'pyim-process)
;; ** 根据环境自动切换到英文输入模式
(defun pyim-probe-program-mode ()
@@ -129,9 +130,9 @@
;; 查找前一个非空格字符。
(if (re-search-backward "[^[:space:]\n]" nil t)
(char-to-string (char-after (point))))))
- (> (length (pyim-entered-get 'point-before)) 0)))
+ (> (length (pyim-process-get-entered 'point-before)) 0)))
(not (or (pyim-string-match-p "\\cc" non-digit-str-before-1)
- (> (length (pyim-entered-get 'point-before)) 0))))))
+ (> (length (pyim-process-get-entered 'point-before)) 0))))))
(defun pyim-probe-auto-english ()
"激活这个 pyim 探针函数后，使用下面的规则自动切换中英文输入：
@@ -149,7 +150,7 @@
(or (if (pyim-string-match-p " " str-before-1)
(pyim-string-match-p "\\cc" str-before-2)
(and (not (pyim-string-match-p "\\cc" str-before-1))
- (= (length (pyim-entered-get 'point-before)) 0)))))))
+ (= (length (pyim-process-get-entered 'point-before))
0)))))))
(declare-function evil-normal-state-p "evil")
(defun pyim-probe-evil-normal-mode ()
@@ -169,7 +170,6 @@
(mapcar #'car pyim-punctuation-dict))
(string-match "^[ \t]*$" line-string))))
-(declare-function pyim-entered-get "pyim-entered" (&optional type))
(declare-function org-inside-LaTeX-fragment-p "org")
(declare-function org-inside-latex-macro-p "org")
