branch: externals/pyim commit b5f5f5febaedc807a0ef91de518400610098a951 Author: Feng Shu <tuma...@163.com> Commit: Feng Shu <tuma...@163.com>
Simplify declare-function. * pyim-probe.el (pyim-char-before-to-string): removed. (pyim-entered-get): update declare-function. * pyim-entered.el (pyim-convert-string-at-point): removed. * pyim-dhashcache.el (pyim-pymap): require. * pyim-dhashcache.el (pyim-pymap-py2cchar-get): removed. --- pyim-dhashcache.el | 3 +-- pyim-dregcache.el | 2 -- pyim-entered.el | 1 - pyim-probe.el | 3 +-- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pyim-dhashcache.el b/pyim-dhashcache.el index 8bd57b9..69bb57a 100644 --- a/pyim-dhashcache.el +++ b/pyim-dhashcache.el @@ -34,6 +34,7 @@ ;;; Code: ;; * 代码 :code: (require 'pyim-common) +(require 'pyim-pymap) (require 'pyim-dcache) (require 'pyim-scheme) (require 'async nil t) @@ -257,8 +258,6 @@ DCACHE 是一个 code -> words 的 hashtable. dcache) (pyim-dcache-write-file file confirm))) -(declare-function pyim-pymap-py2cchar-get "pyim-pymap" (pinyin &optional equal-match return-list include-seperator)) - (defun pyim-dhashcache-get (code &optional from) "从 FROM 对应的 dcaches 中搜索 CODE, 得到对应的词条. diff --git a/pyim-dregcache.el b/pyim-dregcache.el index 16e5319..8ad6f01 100644 --- a/pyim-dregcache.el +++ b/pyim-dregcache.el @@ -266,8 +266,6 @@ DICT-FILES 是词库文件列表. DICTS-MD5 是词库的MD5校验码. (setq start (+ start 2 (length code) (length word)))) output)) -(declare-function pyim-pymap-py2cchar-get "pyim-pymap" (pinyin &optional equal-match return-list include-seperator)) - (defun pyim-dregcache-get (code &optional from) "从 `pyim-dregcache-cache' 搜索 CODE, 得到对应的词条." (if (or (memq 'icode2word from) diff --git a/pyim-entered.el b/pyim-entered.el index c30c949..4332152 100644 --- a/pyim-entered.el +++ b/pyim-entered.el @@ -174,7 +174,6 @@ TYPE 取值为 point-after, 返回 entered buffer 中 point 之后的字符 end-position))) (declare-function pyim-terminate-translation "pyim") -(declare-function pyim-convert-string-at-point "pyim") (defun pyim-entered-refresh (&optional no-delay) "延迟 `pyim-entered-exhibit-delay-ms' 显示备选词等待用户选择。" diff --git a/pyim-probe.el b/pyim-probe.el index e716574..3bbd4e9 100644 --- a/pyim-probe.el +++ b/pyim-probe.el @@ -173,8 +173,7 @@ (mapcar #'car pyim-punctuation-dict)) (string-match "^[ \t]*$" line-string))))) -(declare-function pyim-char-before-to-string "pyim" (num)) -(declare-function pyim-entered-get "pyim" (&optional type)) +(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")