[elpa] externals/pyim 4068123467 1/2: Do not require popon in pyim-page.el

[ELPA Syncer]

branch: externals/pyim
commit 4068123467918935a100ca4268e28126f309f89e
Author: Feng Shu <tuma...@163.com>
Commit: Feng Shu <tuma...@163.com>

    Do not require popon in pyim-page.el
---
 Makefile     |  2 --
 README.org   |  5 ++++-
 pyim-page.el | 12 +++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 3c1d1dae62..904ea8165c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,6 @@ RM=@rm -rf
 
XR_URL="https://git.savannah.gnu.org/cgit/emacs/elpa.git/plain/xr.el?h=externals/xr";
 
ASYNC_URL="https://git.savannah.gnu.org/cgit/emacs/elpa.git/plain/async.el?h=externals/async";
 
POPUP_URL="https://git.savannah.gnu.org/cgit/emacs/nongnu.git/plain/popup.el?h=elpa/popup";
-POPON_URL="https://git.savannah.gnu.org/cgit/emacs/nongnu.git/plain/popon.el?h=elpa/popon";
 
POSFRAME_URL="https://git.savannah.gnu.org/cgit/emacs/elpa.git/plain/posframe.el?h=externals/posframe";
 
 ## Download pyim-basedict V0.5.0 (commit: 
7495c974ada99f9fed96d8e85d8b97dabce9532c)
@@ -26,7 +25,6 @@ deps:
        @if [ ! -f .deps/xr.el ]; then curl -L $(XR_URL) > .deps/xr.el; fi;
        @if [ ! -f .deps/async.el ]; then curl -L $(ASYNC_URL) > 
.deps/async.el; fi;
        @if [ ! -f .deps/popup.el ]; then curl -L $(POPUP_URL) > 
.deps/popup.el; fi;
-       @if [ ! -f .deps/popon.el ]; then curl -L $(POPON_URL) > 
.deps/popon.el; fi;
        @if [ ! -f .deps/pyim-basedict.pyim ]; then curl -L 
$(BASEDICT_PYIM_URL) > .deps/pyim-basedict.pyim; fi;
        @if [ ! -f .deps/pyim-basedict.el ]; then curl -L $(BASEDICT_URL) > 
.deps/pyim-basedict.el; fi;
        @if [ ! -f .deps/posframe.el ]; then curl -L $(POSFRAME_URL) > 
.deps/posframe.el; fi;
diff --git a/README.org b/README.org
index 2a6b2905a6..4f4f1fb77c 100644
--- a/README.org
+++ b/README.org
@@ -216,12 +216,15 @@ pyim 支持双拼输入模式，用户可以通过变量 `pyim-default-scheme' 
 ** 让选词框跟随光标
 用户可以通过下面的设置让 pyim 在 *光标处* 显示一个选词框：
 
-1. 使用 popup 包来绘制选词框 （emacs overlay 机制）
+1. 使用 popup 或者 popon 包来绘制选词框 （emacs overlay 机制）
    #+begin_example
+   (require 'popup)
    (setq pyim-page-tooltip 'popup)
+   ;; (setq pyim-page-tooltip 'popon)
    #+end_example
 2. 使用 posframe 来绘制选词框
    #+begin_example
+   (require 'posframe)
    (setq pyim-page-tooltip 'posframe)
    #+end_example
    注意：pyim 不会自动安装 posframe, 用户需要手动安装这个包，
diff --git a/pyim-page.el b/pyim-page.el
index c32748c3f3..ab8275ebcc 100644
--- a/pyim-page.el
+++ b/pyim-page.el
@@ -32,8 +32,6 @@
 (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)
 
@@ -339,8 +337,8 @@ page 的概念，比如，上面的 “nihao” 的 *待选词列表* 就可以
                       (make-string n ?\ )))
                 string)))))))
 
-(declare-function 'popup-tip "popup")
-(declare-function 'popup-delete "popup")
+(declare-function popup-tip "popup")
+(declare-function popup-delete "popup")
 (defvar popup-version)
 
 (cl-defmethod pyim-page-show (string position (_tooltip (eql popup)))
@@ -355,9 +353,9 @@ page 的概念，比如，上面的 “nihao” 的 *待选词列表* 就可以
                (unless (version<= popup-version "0.5.8")
                  (list :face 'pyim-page)))))
 
-(declare-function 'popon-create "popon")
-(declare-function 'popon-kill "popon")
-(declare-function 'popon-x-y-at-pos "popon")
+(declare-function popon-create "popon")
+(declare-function popon-kill "popon")
+(declare-function popon-x-y-at-pos "popon")
 
 (cl-defmethod pyim-page-show (string position (_tooltip (eql popon)))
   "Show STRING at POSITION with the help of popon."