branch: externals/pyim
commit 36e453b5f9c3d0f170d58a9ab45c0af654213e44
Author: Feng Shu <tuma...@163.com>
Commit: Feng Shu <tuma...@163.com>
Remove obsolete variables and functions.
* pyim.el (pyim-page-select-finish-hook)
(pyim-page-select-word-by-number, pyim-active-hook)
(pyim-inactive-hook, pyim-active, pyim-inactivate, pyim-import)
(pyim-export, pyim-page-select-word-simple)
(pyim-page-select-word, pyim-page-select-word-by-number)
(pyim-entered-delete-backward-char)
(pyim-entered-delete-forward-char)
(pyim-entered-delete-backward-imelem)
(pyim-entered-delete-forward-imelem)
(pyim-entered-delete-backward-imelem)
(pyim-entered-delete-backward-char, pyim-entered-forward-point)
(pyim-entered-backward-point, pyim-entered-forward-imelem)
(pyim-entered-backward-imelem, pyim-entered-end-of-line): Removed
* pyim-pinyin.el (pyim-fuzzy-pinyin-alist): Removed.
* pyim-page.el (pyim-posframe-border-width)
(pyim-posframe-min-width): Removed.
* pyim-outcome.el (pyim-translate-trigger-char)
(pyim-outcome-trigger-char, pyim-wash-function)
(pyim-wash-current-line-function): Removed.
* pyim-cregexp.el (pyim-convert-cregexp-at-point)
(pyim-ivy-cregexp): Removed.
---
pyim-cregexp.el | 2 --
pyim-outcome.el | 4 ----
pyim-page.el | 2 --
pyim-pinyin.el | 1 -
pyim.el | 32 --------------------------------
5 files changed, 41 deletions(-)
diff --git a/pyim-cregexp.el b/pyim-cregexp.el
index 51a3ef2..7bcbbfb 100644
--- a/pyim-cregexp.el
+++ b/pyim-cregexp.el
@@ -211,7 +211,6 @@ regexp, 所以搜索单字的时候一般可以搜到生僻字，但搜索句子
(unless (equal regexp "")
(concat (if match-beginning "^" "") regexp)))))
-(define-obsolete-function-alias 'pyim-convert-cregexp-at-point
'pyim-cregexp-convert-at-point "4.0")
(defun pyim-cregexp-convert-at-point (&optional insert-only)
"将光标前的字符串按拼音的规则转换为一个搜索中文的 regexp.
用于实现拼音搜索中文的功能。
@@ -270,7 +269,6 @@ regexp, 所以搜索单字的时候一般可以搜到生僻字，但搜索句子
(declare-function ivy--regex-plus "ivy")
-(define-obsolete-function-alias 'pyim-ivy-cregexp 'pyim-cregexp-ivy "4.0")
(defun pyim-cregexp-ivy (str)
"Let ivy support search Chinese with pinyin feature."
(let ((x (ivy--regex-plus str))
diff --git a/pyim-outcome.el b/pyim-outcome.el
index fe178af..29c9af3 100644
--- a/pyim-outcome.el
+++ b/pyim-outcome.el
@@ -34,8 +34,6 @@
"Outcome tools for pyim."
:group 'pyim)
-(define-obsolete-variable-alias 'pyim-translate-trigger-char
'pyim-outcome-trigger "4.0")
-(define-obsolete-variable-alias 'pyim-outcome-trigger-char
'pyim-outcome-trigger "4.0")
(defcustom pyim-outcome-trigger "v"
"用于触发特殊操作的字符，相当与单字快捷键.
@@ -85,7 +83,6 @@ pyim 使用函数 `pyim-process-outcome-handle-char' 来处理特殊功能触发
具体请参考 `pyim-outcome-get-trigger' 。"
:type '(choice (const nil) string))
-(define-obsolete-variable-alias 'pyim-wash-function
'pyim-outcome-trigger-function "4.0")
(defcustom pyim-outcome-trigger-function 'pyim-outcome-trigger-function-default
"可以使用 `pyim-outcome-trigger' 激活的函数。
@@ -163,7 +160,6 @@ pyim 的 translate-trigger-char 要占用一个键位，为了防止用户
(car prefer-triggers))
user-trigger)))
-(define-obsolete-function-alias 'pyim-wash-current-line-function
'pyim-outcome-trigger-function-default "4.0")
(defun pyim-outcome-trigger-function-default (&optional no-space)
"默认的 `pyim-outcome-trigger-function'.
diff --git a/pyim-page.el b/pyim-page.el
index 95f9b3b..747c2c1 100644
--- a/pyim-page.el
+++ b/pyim-page.el
@@ -67,13 +67,11 @@ pyim 内建的有三种选词框格式：
3. vertical 垂直选词框"
:type 'symbol)
-(define-obsolete-variable-alias 'pyim-posframe-border-width
'pyim-page-posframe-border-width "4.0")
(defcustom pyim-page-posframe-border-width 0
"posframe的内间距。
只有当用户使用 posframe 来显示候选词时才有效。"
:type 'integer)
-(define-obsolete-variable-alias 'pyim-posframe-min-width
'pyim-page-posframe-min-width "4.0")
(defcustom pyim-page-posframe-min-width (* pyim-page-length 7)
"使用 posframe 做为选词框时，设置选词框的最小宽度."
:type 'integer)
diff --git a/pyim-pinyin.el b/pyim-pinyin.el
index b32b331..49961d7 100644
--- a/pyim-pinyin.el
+++ b/pyim-pinyin.el
@@ -48,7 +48,6 @@
'("a" "o" "e" "ai" "ei" "ui" "ao" "ou" "er" "an" "en"
"ang" "eng"))
-(define-obsolete-function-alias 'pyim-fuzzy-pinyin-alist
'pyim-pinyin-fuzzy-alist "4.0")
(defcustom pyim-pinyin-fuzzy-alist
'(("en" "eng")
("in" "ing")
diff --git a/pyim.el b/pyim.el
index b29e27e..6687e51 100644
--- a/pyim.el
+++ b/pyim.el
@@ -45,7 +45,6 @@
"Pyim is a Chinese input method support quanpin, shuangpin, wubi and
cangjie."
:group 'leim)
-(define-obsolete-variable-alias 'pyim-page-select-finish-hook
'pyim-select-finish-hook "4.0")
(defcustom pyim-select-finish-hook nil
"Pyim 选词完成时运行的 hook."
:type 'hook)
@@ -61,7 +60,6 @@ Tip: 用户也可以利用 `pyim-outcome-trigger-function-default' 函数
来构建适合自己的 hook 函数。"
:type 'hook)
-(define-obsolete-variable-alias 'pyim-page-select-word-by-number
'pyim-select-word-by-number "4.0")
(defcustom pyim-select-word-by-number t
"使用数字键来选择词条.
@@ -73,15 +71,6 @@ Tip: 用户也可以利用 `pyim-outcome-trigger-function-default' 函数
(defvar pyim-title "PYIM ")
(defvar pyim-load-hook nil)
-
-(define-obsolete-variable-alias
- 'pyim-active-hook
- 'pyim-activate-hook "4.0.0")
-
-(define-obsolete-variable-alias
- 'pyim-inactive-hook
- 'pyim-deactivate-hook "4.0.0")
-
(defvar pyim-activate-hook nil)
(defvar pyim-deactivate-hook nil)
@@ -233,8 +222,6 @@ Tip: 用户也可以利用 `pyim-outcome-trigger-function-default' 函数
(register-input-method "pyim" "UTF-8" #'pyim-activate pyim-title)
;; ** PYim 输入法启动功能
-(define-obsolete-function-alias 'pyim-active 'pyim-activate "4.0.0")
-
;;;###autoload
(defun pyim-activate (&optional _args)
"pyim 启动函数.
@@ -286,7 +273,6 @@ pyim 使用函数 `pyim-activate' 启动输入法的时候，会将变量
(pyim-process-save-dcaches t))
;; ** 取消激活功能
-(define-obsolete-function-alias 'pyim-inactivate 'pyim-deactivate "4.0.0")
(defun pyim-deactivate ()
"取消 pyim 的激活状态."
(interactive)
@@ -383,7 +369,6 @@ SILENT 设置为 t 是，不显示提醒信息。"
(message "将词条: %S 插入 personal file。" output))))))
;; ** 导入词条功能
-(define-obsolete-function-alias 'pyim-import 'pyim-import-words-and-counts
"4.0")
(defun pyim-import-words-and-counts (file &optional merge-method silent)
"从 FILE 中导入词条以及词条对应的词频信息。
@@ -440,7 +425,6 @@ MERGE-METHOD 是一个函数，这个函数需要两个数字参数，代表词
(message "PYIM: 词条和词频信息导入完成！")))
;; ** 导出功能
-(define-obsolete-function-alias 'pyim-export 'pyim-export-words-and-counts
"4.0")
(defalias 'pyim-export-words-and-counts 'pyim-dcache-export-words-and-counts)
(defalias 'pyim-export-personal-words 'pyim-dcache-export-personal-words)
@@ -502,7 +486,6 @@ FILE 的格式与 `pyim-dcache-export' 生成的文件格式相同，
(defalias 'pyim-next-word #'pyim-page-next-word)
;; ** 选词功能
-(define-obsolete-function-alias 'pyim-page-select-word-simple
'pyim-select-word-simple "4.0")
(defun pyim-select-word-simple ()
"从选词框中选择当前词条.
这个函数与 `pyim-select-word' 的区别是：
@@ -516,7 +499,6 @@ FILE 的格式与 `pyim-dcache-export' 生成的文件格式相同，
(pyim-process-outcome-handle 'candidate))
(pyim-process-terminate))
-(define-obsolete-function-alias 'pyim-page-select-word 'pyim-select-word "4.0")
(defun pyim-select-word ()
"从选词框中选择当前词条，然后删除该词条对应拼音。"
(interactive)
@@ -624,7 +606,6 @@ FILE 的格式与 `pyim-dcache-export' 生成的文件格式相同，
;; pyim 使用这个 hook 来处理联想词。
(run-hooks 'pyim-select-finish-hook)))
-(define-obsolete-function-alias 'pyim-page-select-word-by-number
'pyim-select-word-by-number "4.0")
(defun pyim-select-word-by-number (&optional n)
"使用数字编号来选择对应的词条。"
(interactive)
@@ -690,19 +671,6 @@ FILE 的格式与 `pyim-dcache-export' 生成的文件格式相同，
(pyim-process-run)))
;; ** PYIM 输入操作命令
-(define-obsolete-function-alias 'pyim-entered-delete-backward-char
'pyim-delete-backward-char "4.0")
-(define-obsolete-function-alias 'pyim-entered-delete-forward-char
'pyim-delete-forward-char "4.0")
-(define-obsolete-function-alias 'pyim-entered-delete-forward-char
'pyim-delete-forward-char "4.0")
-(define-obsolete-function-alias 'pyim-entered-delete-backward-imelem
'pyim-delete-backward-imelem "4.0")
-(define-obsolete-function-alias 'pyim-entered-delete-forward-imelem
'pyim-delete-forward-imelem "4.0")
-(define-obsolete-function-alias 'pyim-entered-delete-backward-imelem
'pyim-delete-backward-imelem "4.0")
-(define-obsolete-function-alias 'pyim-entered-delete-backward-char
'pyim-delete-backward-char "4.0")
-(define-obsolete-function-alias 'pyim-entered-forward-point
'pyim-forward-point "4.0")
-(define-obsolete-function-alias 'pyim-entered-backward-point
'pyim-backward-point "4.0")
-(define-obsolete-function-alias 'pyim-entered-forward-imelem
'pyim-forward-imelem "4.0")
-(define-obsolete-function-alias 'pyim-entered-backward-imelem
'pyim-backward-imelem "4.0")
-(define-obsolete-function-alias 'pyim-entered-end-of-line 'pyim-end-of-line
"4.0")
-
(defun pyim-forward-point ()
"光标前移"
(interactive)
