[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/pyim 689980a 2/4: Fix pyim-posframe-valid-p error.
From: |
ELPA Syncer |
Subject: |
[elpa] externals/pyim 689980a 2/4: Fix pyim-posframe-valid-p error. |
Date: |
Fri, 23 Apr 2021 14:57:15 -0400 (EDT) |
branch: externals/pyim
commit 689980a517cdd270b4391620a1c9d9d2c9c340cd
Author: Feng Shu <tumashu@163.com>
Commit: Feng Shu <tumashu@163.com>
Fix pyim-posframe-valid-p error.
* pyim.el (pyim-start, pyim-terminate-translation): Use
pyim-posframe-workable-p.
* pyim-page.el (pyim-page-posframe-workable-p): removed.
(pyim-page-tooltip-show):
* pyim-common.el (pyim-posframe-workable-p): New function.
---
pyim-common.el | 4 ++++
pyim-page.el | 7 +------
pyim.el | 4 ++--
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/pyim-common.el b/pyim-common.el
index c3eb30e..9080be9 100644
--- a/pyim-common.el
+++ b/pyim-common.el
@@ -120,6 +120,10 @@ better way is let exwm provide a test function.
for example: https://github.com/ch11ng/exwm/pull/831"
(string-match-p " \\*temp\\*" (buffer-name)))
+(defun pyim-posframe-workable-p ()
+ "Test posframe's workable status."
+ (and (functionp 'posframe-workable-p)
+ (posframe-workable-p)))
;; * Footer
(provide 'pyim-common)
diff --git a/pyim-page.el b/pyim-page.el
index 9ebdc35..5bf0aea 100644
--- a/pyim-page.el
+++ b/pyim-page.el
@@ -458,16 +458,11 @@ page 的概念,比如,上面的 “nihao” 的 *待选词列表* 就可以
(gethash :current-page page-info)
(gethash :total-page page-info)))
-(defun pyim-page-posframe-workable-p ()
- "Test posframe's workable status."
- (and (functionp 'posframe-workable-p)
- (posframe-workable-p)))
-
(defun pyim-page-tooltip-show (string position)
"在 POSITION 位置,使用 posframe 或者 popup 显示字符串 STRING."
(let ((tooltip pyim-page-tooltip))
(cond ((and (eq tooltip 'posframe)
- (pyim-page-posframe-workable-p))
+ (pyim-posframe-workable-p))
(posframe-show pyim-page-tooltip-posframe-buffer
:string string
:position position
diff --git a/pyim.el b/pyim.el
index ff852b1..8ac8051 100644
--- a/pyim.el
+++ b/pyim.el
@@ -243,7 +243,7 @@ pyim 使用函数 `pyim-start' 启动输入法的时候,会将变量
(add-hook 'minibuffer-exit-hook #'pyim-exit-from-minibuffer))
(run-hooks 'pyim-active-hook)
(when (and (eq pyim-page-tooltip 'posframe)
- (not (pyim-page-posframe-workable-p)))
+ (not (pyim-posframe-workable-p)))
(message "PYIM: posframe 没有正确安装或者当前 Emacs 版本不支持 posframe。"))
(when restart
(message "pyim 重启完成。"))
@@ -630,7 +630,7 @@ Return the input string.
(setq pyim-assistant-scheme-enable nil)
(setq pyim-force-input-chinese nil)
(when (and (eq pyim-page-tooltip 'posframe)
- (pyim-posframe-valid-p))
+ (pyim-posframe-workable-p))
(posframe-hide pyim-page-tooltip-posframe-buffer))
(pyim-entered-erase-buffer)
(let* ((class (pyim-scheme-get-option (pyim-scheme-name) :class))