[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/pyim 22c4050 1/4: pyim-posframe-valid-p -> pyim-page-po
From: |
ELPA Syncer |
Subject: |
[elpa] externals/pyim 22c4050 1/4: pyim-posframe-valid-p -> pyim-page-posframe-workable-p |
Date: |
Fri, 23 Apr 2021 07:57:11 -0400 (EDT) |
branch: externals/pyim
commit 22c4050a45b38ec71f87366a1d8018da970480a5
Author: Feng Shu <tumashu@163.com>
Commit: Feng Shu <tumashu@163.com>
pyim-posframe-valid-p -> pyim-page-posframe-workable-p
* pyim-page.el (pyim-page-posframe-workable-p): New function.
(pyim-page-tooltip-show): Use pyim-page-posframe-workable-p.
* pyim-common.el (pyim-posframe-valid-p): Removed.
---
pyim-common.el | 8 --------
pyim-page.el | 7 ++++++-
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/pyim-common.el b/pyim-common.el
index c723745..8afeb84 100644
--- a/pyim-common.el
+++ b/pyim-common.el
@@ -112,14 +112,6 @@
(when (char-after point-after)
(char-to-string (char-after point-after)))))
-(defun pyim-posframe-valid-p ()
- "Test posframe's status."
- (and (>= emacs-major-version 26)
- (featurep 'posframe)
- (not (or noninteractive
- emacs-basic-display
- (not (display-graphic-p))))))
-
(defun pyim-exwm-enable-p ()
"测试当前是否是 exwm 环境。"
(string-match-p " \\*temp\\*" (buffer-name)))
diff --git a/pyim-page.el b/pyim-page.el
index 996c53f..c5eed25 100644
--- a/pyim-page.el
+++ b/pyim-page.el
@@ -458,11 +458,16 @@ 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-posframe-valid-p))
+ (pyim-page-posframe-workable-p))
(posframe-show pyim-page-tooltip-posframe-buffer
:string string
:position position