[elpa] externals/pyim 710c0d5 3/3: pyim-with-entered-buffer -> pyim-entered-with-entered-buffer

[ELPA Syncer]

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

    pyim-with-entered-buffer -> pyim-entered-with-entered-buffer
---
 pyim-entered.el |  6 +++---
 pyim-page.el    | 14 +++++++-------
 pyim-process.el |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pyim-entered.el b/pyim-entered.el
index c6726c4..181033b 100644
--- a/pyim-entered.el
+++ b/pyim-entered.el
@@ -56,7 +56,7 @@ pyim 使用一个 buffer 来处理 entered, 以实现 “用户输入字符串
 (defvar pyim-entered-longest nil
   "记录用户在连续选词之前的最长输入，用于全拼输入法多音字矫正。")
 
-(defmacro pyim-with-entered-buffer (&rest forms)
+(defmacro pyim-entered-with-entered-buffer (&rest forms)
   (declare (indent 0) (debug t))
   `(with-current-buffer (get-buffer-create pyim-entered-buffer)
      ,@forms))
@@ -68,7 +68,7 @@ pyim 使用一个 buffer 来处理 entered, 以实现 “用户输入字符串
 point-before, 返回 entered buffer 中 point 之前的字符串，如果
 TYPE 取值为 point-after, 返回 entered buffer 中 point 之后的字符
 串。"
-  (pyim-with-entered-buffer
+  (pyim-entered-with-entered-buffer
     (cond
      ((bobp) (buffer-string))
      ((eq type 'point-before)
@@ -79,7 +79,7 @@ TYPE 取值为 point-after, 返回 entered buffer 中 point 之后的字符
 
 (defun pyim-entered-erase-buffer ()
   "清除 `pyim-entered-buffer' 的内容"
-  (pyim-with-entered-buffer
+  (pyim-entered-with-entered-buffer
     (erase-buffer)))
 
 ;; * Footer
diff --git a/pyim-page.el b/pyim-page.el
index 11af406..ca436cc 100644
--- a/pyim-page.el
+++ b/pyim-page.el
@@ -282,7 +282,7 @@ page 的概念，比如，上面的 “nihao” 的 *待选词列表* 就可以
     (when class
       (funcall (intern (format "pyim-page-preview-create:%S" class)) 
separator))))
 
-(declare-function 'pyim-with-entered-buffer "pyim-entered")
+(declare-function 'pyim-entered-with-entered-buffer "pyim-entered")
 
 (defun pyim-page-preview-create:quanpin (&optional separator)
   (let* ((separator (or separator " "))
@@ -294,7 +294,7 @@ page 的概念，比如，上面的 “nihao” 的 *待选词列表* 就可以
                                 separator)))
     (concat
      ;; | 显示光标位置的字符
-     (pyim-with-entered-buffer
+     (pyim-entered-with-entered-buffer
        (if (equal 1 (point))
            (concat "|" translated)
          (concat (replace-regexp-in-string (concat separator "'") "'" 
translated)
@@ -348,11 +348,11 @@ page 的概念，比如，上面的 “nihao” 的 *待选词列表* 就可以
                                "'")))
       ;; | 显示光标位置的字符
       (pyim-process-with-entered-buffer
-       (if (equal (point) (point-max))
-           (fmt (buffer-substring-no-properties (point-min) (point-max)))
-         (concat (fmt (buffer-substring-no-properties (point-min) (point)))
-                 "| "
-                 (fmt (buffer-substring-no-properties (point) 
(point-max)))))))))
+        (if (equal (point) (point-max))
+            (fmt (buffer-substring-no-properties (point-min) (point-max)))
+          (concat (fmt (buffer-substring-no-properties (point-min) (point)))
+                  "| "
+                  (fmt (buffer-substring-no-properties (point) 
(point-max)))))))))
 
 (defun pyim-page-menu-create (candidates position &optional separator 
hightlight-current)
   "这个函数用于创建在 page 中显示的备选词条菜单。"
diff --git a/pyim-process.el b/pyim-process.el
index ef275e0..1ce9816 100644
--- a/pyim-process.el
+++ b/pyim-process.el
@@ -108,7 +108,7 @@
   "PYIM 流程的输入保存在一个 buffer 中，使用 FORMS 处理这个 buffer
 中的信息。"
   (declare (indent 0) (debug t))
-  `(pyim-with-entered-buffer
+  `(pyim-entered-with-entered-buffer
      ,@forms))
 
 (defun pyim-process-get-entered (&optional type)
@@ -118,7 +118,7 @@
   "从 `pyim-entered-buffer' 的当前位置，找到下一个或者下 NUM 个 imelem 对应的位置
 
 如果 SEARCH-FORWARD 为 t, 则向前搜索，反之，向后搜索。"
-  (pyim-with-entered-buffer
+  (pyim-entered-with-entered-buffer
     (let* ((scheme-name (pyim-scheme-name))
            (start (or start (point)))
            (end-position start)