[elpa] externals/pyim 91f2348b7e 3/3: Improve popon support.

[ELPA Syncer]

branch: externals/pyim
commit 91f2348b7ef97832c84d8dc5fff1d3b47bc0286d
Author: Feng Shu <tumashu@163.com>
Commit: Feng Shu <tumashu@163.com>

    Improve popon support.
---
 pyim-page.el   | 12 ++++++++++--
 tests/Makefile |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pyim-page.el b/pyim-page.el
index dc61fd01ae..c32748c3f3 100644
--- a/pyim-page.el
+++ b/pyim-page.el
@@ -32,6 +32,8 @@
 (require 'posframe nil t)
 ;; popup 不是 GNU ELPA 包，所以 pyim 不能强制依赖它。
 (require 'popup nil t)
+;; popon 不是 GNU ELPA 包，所以 pyim 不能强制依赖它。
+(require 'popon nil t)
 (require 'pyim-common)
 (require 'pyim-process)
 
@@ -53,15 +55,19 @@
 2. 当这个变量取值为 popup 时，使用 popup-el 包来绘制选词框，
    这个选项可以在 emacs 图形版和终端版使用，速度没有 posframe 快，
    偶尔会遇到选词框错位的问题。
-3. 当这个变量取值为 minibuffer 时，minibuffer 将做为选词框，
+3. 当这个变量取值为 popon 时，使用 popon 包来绘制选词框，这个选项
+   效果类似 popup, 不过目前不支持背景颜色。
+4. 当这个变量取值为 minibuffer 时，minibuffer 将做为选词框，
    这个选项也作为其他选项不可用时的 fallback.
-4. 当这个变量的取值是为一个 list 时，pyim 将按照优先顺序动态
+5. 当这个变量的取值是为一个 list 时，pyim 将按照优先顺序动态
    选择一个当前环境可用的 tooltip."
   :type '(choice (repeat (choice (const posframe)
                                  (const popup)
+                                 (const popon)
                                  (const minibuffer)))
                  (const posframe)
                  (const popup)
+                 (const popon)
                  (const minibuffer)))
 
 (defcustom pyim-page-style 'two-lines
@@ -135,6 +141,8 @@ Only useful when use posframe.")
      :test posframe-workable-p)
     (popup
      :package popup)
+    (popon
+     :package popon)
     (minibuffer
      :package minibuffer))
   "pyim-page tooltip 相关信息。
diff --git a/tests/Makefile b/tests/Makefile
index e33e9e543c..4c5c19d812 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -17,6 +17,7 @@ deps:
        @if [ ! -f deps/xr.el ]; then curl -L 
"https://git.savannah.gnu.org/cgit/emacs/elpa.git/plain/xr.el?h=externals/xr"; > 
deps/xr.el; fi;
        @if [ ! -f deps/async.el ]; then curl -L 
"https://git.savannah.gnu.org/cgit/emacs/elpa.git/plain/async.el?h=externals/async";
 > deps/async.el; fi;
        @if [ ! -f deps/popup.el ]; then curl -L 
"https://git.savannah.gnu.org/cgit/emacs/nongnu.git/plain/popup.el?h=elpa/popup";
 > deps/popup.el; fi;
+       @if [ ! -f deps/popon.el ]; then curl -L 
"https://git.savannah.gnu.org/cgit/emacs/nongnu.git/plain/popon.el?h=elpa/popon";
 > deps/popon.el; fi;
     ## Download pyim-basedict V0.5.0 (commit: 
7495c974ada99f9fed96d8e85d8b97dabce9532c)
        @if [ ! -f deps/pyim-basedict.pyim ]; then curl -L 
"https://git.savannah.gnu.org/cgit/emacs/elpa.git/plain/pyim-basedict.pyim?h=externals/pyim-basedict&id=7495c974ada99f9fed96d8e85d8b97dabce9532c";
 > deps/pyim-basedict.pyim; fi;
        @if [ ! -f deps/pyim-basedict.el ]; then curl -L 
"https://git.savannah.gnu.org/cgit/emacs/elpa.git/plain/pyim-basedict.el?h=externals/pyim-basedict&id=7495c974ada99f9fed96d8e85d8b97dabce9532c";
 > deps/pyim-basedict.el; fi;