import FreeBSD's tamago-emacs24-4.0.6.0.20041122.19_12. (#34861)

* egg.el(egg-version) updated 5.0.6.0 -> 5.0.7.0
* NEWS: added 5.0.7.0

*** imported FreeBSD's tamago-emacs24-4.0.6.0.20041122.19_12. (#34861)
Hiroki Sato <hrs@allbsd.org> updated FreeBSD' tamago.
So I imported it.

** used (with-current-buffer) instead of (save-excursion)
* egg-com.el(pre-write-encode-fixed-euc-china)
(comm-call-with-proc)
* egg.el(egg-activate-keymap-after-command)
* egg/anthy.el(anthy-egg-new-environment)
(anthy-egg-add-word)
* egg/anthyipc.el(anthyipc-call-with-proc)
* egg/canna.el(canna-open)
* egg/cannarpc.el(cannarpc-call-with-environment)
* egg/sj3.el(sj3-open)
* egg/sj3rpc.el(sj3rpc-call-with-environment)
* egg/wnn.el(wnn-open)
* egg/wnnrpc.el(wnnrpc-file-receive)
* menudiag.el(menudiag-selection-goto-internal)

* egg.el(egg-mode): used (fboundp) insted of (boundp)
(egg-exit-from-minibuffer): used (fboundp) insted of (boundp)

* egg/canna.el(canna-make-backend): quoted (fboundp)'s argument
* egg/wnn.el(wnn-make-backend): quoted (fboundp)'s argument

* egg/anthy.el: added copyright 2015 Hiroki Sato <hrs@allbsd.org>
* egg/anthyipc.el: added copyright 2015 Hiroki Sato <hrs@allbsd.org>
* egg/canna.el: added copyright 2015 Hiroki Sato <hrs@allbsd.org>
* egg/cannarpc.el: added copyright 2015 Hiroki Sato <hrs@allbsd.org>
* egg/sj3.el: added copyright 2015 Hiroki Sato <hrs@allbsd.org>
* egg/sj3rpc.el: added copyright 2015 Hiroki Sato <hrs@allbsd.org>
* egg/wnn.el: added copyright 2015 Hiroki Sato <hrs@allbsd.org>

diff --git a/ChangeLog b/ChangeLog
index a920d76..8898c77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,42 @@
 2015-02-02  Mitsutoshi NAKANO  <bkbin005@rinku.zaq.ne.jp>
 
+       * egg.el(egg-version) updated 5.0.6.0 -> 5.0.7.0
+       * NEWS: added 5.0.7.0
+
+       *** imported FreeBSD's tamago-emacs24-4.0.6.0.20041122.19_12. (#34861)
+       Hiroki Sato <hrs@allbsd.org> updated FreeBSD' tamago.
+       So I imported it.
+
+       ** used (with-current-buffer) instead of (save-excursion)
+       * egg-com.el(pre-write-encode-fixed-euc-china)
+       (comm-call-with-proc)
+       * egg.el(egg-activate-keymap-after-command)
+       * egg/anthy.el(anthy-egg-new-environment)
+       (anthy-egg-add-word)
+       * egg/anthyipc.el(anthyipc-call-with-proc)
+       * egg/canna.el(canna-open)
+       * egg/cannarpc.el(cannarpc-call-with-environment)
+       * egg/sj3.el(sj3-open)
+       * egg/sj3rpc.el(sj3rpc-call-with-environment)
+       * egg/wnn.el(wnn-open)
+       * egg/wnnrpc.el(wnnrpc-file-receive)
+       * menudiag.el(menudiag-selection-goto-internal)
+
+       * egg.el(egg-mode): used (fboundp) insted of (boundp)
+       (egg-exit-from-minibuffer): used (fboundp) insted of (boundp)
+
+       * egg/canna.el(canna-make-backend): quoted (fboundp)'s argument
+       * egg/wnn.el(wnn-make-backend): quoted (fboundp)'s argument
+
+       * egg/anthy.el: added copyright 2015 Hiroki Sato <hrs@allbsd.org>
+       * egg/anthyipc.el: added copyright 2015 Hiroki Sato <hrs@allbsd.org>
+       * egg/canna.el: added copyright 2015 Hiroki Sato <hrs@allbsd.org>
+       * egg/cannarpc.el: added copyright 2015 Hiroki Sato <hrs@allbsd.org>
+       * egg/sj3.el: added copyright 2015 Hiroki Sato <hrs@allbsd.org>
+       * egg/sj3rpc.el: added copyright 2015 Hiroki Sato <hrs@allbsd.org>
+       * egg/wnn.el: added copyright 2015 Hiroki Sato <hrs@allbsd.org>
+
+
        * egg.el(egg-version): updated 5.0.5.0 -> 5.0.6.0
        * COPYING *.el */*.el: fixed FSF address (#34859)
        http://sourceforge.jp/ticket/browse.php?group_id=9668&tid=34859

diff --git a/NEWS b/NEWS
index 47dbcf3..4c8c5d3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 NEWS about tamago-tsunagi
 =========================
 
+## 5.0.7.0 imported FreeBSD's tamago-emacs24-4.0.6.0.20041122.19_12. (#34861)
+
+https://sourceforge.jp/ticket/browse.php?group_id=9668&tid=34861
+
 ## 5.0.6.0 fixed #34859 #34862 by Mitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp>
 
 ### fixed FSF address (#34859)

diff --git a/egg-com.el b/egg-com.el
index 3a74faa..4981dbe 100644 (file)
--- a/egg-com.el
+++ b/egg-com.el
@@ -596,8 +596,7 @@
     (set-buffer work)
     (erase-buffer)
     (if (null (stringp from))
-       (save-excursion
-         (set-buffer buf)
+       (with-current-buffer buf
          (setq from (buffer-substring from to))))
     (insert (string-as-multibyte from))
     (encode-fixed-euc-china-region 1 (point-max) type)
@@ -987,8 +986,7 @@ See `comm-format' for FORMAT."
          ,@vlist)
      (if (and (memq (process-status proc) '(open run))
              (buffer-live-p buffer))
-        (save-excursion
-          (set-buffer buffer)
+        (with-current-buffer buffer
           (let ,euc-select
             (erase-buffer)
             ,send-expr

diff --git a/egg.el b/egg.el
index 177451a..4dbb4fc 100644 (file)
--- a/egg.el
+++ b/egg.el
@@ -30,7 +30,7 @@
 
 ;;; Code:
 
-(defconst egg-version "5.0.6.0"
+(defconst egg-version "5.0.7.0"
   "Version number for this version of Tamago.")
 
 (defconst egg-tsunagi-version egg-version
@@ -123,10 +123,10 @@
 
 (defun egg-activate-keymap-after-command ()
   (while egg-change-major-mode-buffer
-    (save-excursion
-      (when (buffer-live-p (car egg-change-major-mode-buffer))
-       (set-buffer (car egg-change-major-mode-buffer))
-       (egg-activate-keymap))
+    (let ((buf (car egg-change-major-mode-buffer)))
+      (if (buffer-live-p buf)
+          (with-current-buffer buf
+            (egg-activate-keymap)))
       (setq egg-change-major-mode-buffer (cdr egg-change-major-mode-buffer))))
   (remove-hook 'post-command-hook 'egg-activate-keymap-after-command))
 
@@ -170,7 +170,7 @@
          (setq egg-modefull-mode t)
          (its-define-select-keys egg-modefull-map))
       (setq egg-modeless-mode t))
-    (set (if (boundp 'deactivate-current-input-method-function)
+    (set (if (fboundp 'deactivate-current-input-method-function)
             'deactivate-current-input-method-function
           'inactivate-current-input-method-function)
         'egg-mode)
@@ -183,7 +183,7 @@
     (run-hooks 'egg-mode-hook)))
 
 (defun egg-exit-from-minibuffer ()
-  (if (boundp 'deactivate-input-method)
+  (if (fboundp 'deactivate-input-method)
       (deactivate-input-method)
     (inactivate-input-method))
   (if (<= (minibuffer-depth) 1)

diff --git a/egg/anthy.el b/egg/anthy.el
index 806f01e..7a1704e 100644 (file)
--- a/egg/anthy.el
+++ b/egg/anthy.el
@@ -2,6 +2,7 @@
 ;;;                Input Method Architecture
 
 ;; Copyright (C) 2002 The Free Software Initiative of Japan
+;;               2015 Hiroki Sato <hrs@allbsd.org>
 
 ;; Author: NIIBE Yutaka <gniibe@m17n.org>
 
@@ -147,8 +148,7 @@
        (set-process-coding-system anthy-egg-proc cs cs)
        (set-process-sentinel anthy-egg-proc 'anthy-egg-proc-sentinel)
        (set-marker-insertion-type (process-mark anthy-egg-proc) t)
-       (save-excursion
-         (set-buffer buf)
+       (with-current-buffer buf
          (erase-buffer)
          (buffer-disable-undo))
        (anthyipc-get-greeting anthy-egg-proc)))
@@ -401,8 +401,7 @@ Return the list of bunsetsu."
   (let ((buf (get-buffer-create anthy-egg-dic-buffer-name))
        (cs (if anthy-egg-use-utf8 'utf-8-unix 'euc-japan-unix))
        proc)
-    (save-excursion
-      (set-buffer buf)
+    (with-current-buffer buf
       (setq proc (apply 'start-process "anthy-egg-dic" buf
                        anthy-egg-dic-util-command
                        (if anthy-egg-use-utf8

diff --git a/egg/anthyipc.el b/egg/anthyipc.el
index 897f910..205f237 100644 (file)
--- a/egg/anthyipc.el
+++ b/egg/anthyipc.el
@@ -2,6 +2,7 @@
 ;;;                Input Method Architecture
 
 ;; Copyright (C) 2002 The Free Software Initiative of Japan
+;;               2015 Hiroki Sato <hrs@allbsd.org>
 
 ;; Author: NIIBE Yutaka <gniibe@m17n.org>
 
@@ -43,8 +44,7 @@
          ,@vlist)
      (if (and (eq (process-status proc) 'run)
              (buffer-live-p buffer))
-        (save-excursion
-          (set-buffer buffer)
+        (with-current-buffer buffer
           (erase-buffer)
           ,send-expr
           (goto-char (point-max))

diff --git a/egg/canna.el b/egg/canna.el
index 43f5da4..77109c5 100644 (file)
--- a/egg/canna.el
+++ b/egg/canna.el
@@ -2,6 +2,7 @@
 ;;;                  Egg Input Method Architecture
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc
+;;               2015 Hiroki Sato <hrs@allbsd.org>
 
 ;; Author: NIIBE Yutaka <gniibe@chroot.org>
 
@@ -132,7 +133,7 @@
 (defun canna-make-backend (lang env &optional source-lang converted-lang)
   (let ((finalize (canna-backend-func-name "canna-finalize-backend" lang))
        (backend (canna-backend-func-name "canna-backend" lang env)))
-    (if (null (fboundp finalize))
+    (if (null (fboundp 'finalize))
        (progn
          (fset finalize (function (lambda () (canna-finalize-backend))))
          (egg-set-finalize-backend (list finalize))))
@@ -317,8 +318,7 @@ katakana to candidates list. NOSTUDY specifies not study."
     (unwind-protect
        (progn
          (setq buf (generate-new-buffer " *CANNA*"))
-    (save-excursion
-      (set-buffer buf)
+    (with-current-buffer buf
       (erase-buffer)
       (buffer-disable-undo)
            (set-buffer-multibyte nil)

diff --git a/egg/cannarpc.el b/egg/cannarpc.el
index d240a38..a352c76 100644 (file)
--- a/egg/cannarpc.el
+++ b/egg/cannarpc.el
@@ -2,6 +2,7 @@
 ;;;                     Egg Input Method Architecture
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc
+;;               2015 Hiroki Sato <hrs@allbsd.org>
 
 ;; Author: NIIBE Yutaka <gniibe@chroot.org>
 
@@ -77,8 +78,7 @@
     (list
      'let v
      (append
-       `(save-excursion
-          (set-buffer (process-buffer proc))
+       `(with-current-buffer (process-buffer proc)
           (erase-buffer)
           ,send-expr
           (process-send-region proc (point-min) (point-max))

diff --git a/egg/sj3.el b/egg/sj3.el
index 8f6de3a..3c8cce9 100644 (file)
--- a/egg/sj3.el
+++ b/egg/sj3.el
@@ -2,6 +2,7 @@
 ;;;                Input Method Architecture
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc
+;;               2015 Hiroki Sato <hrs@allbsd.org>
 
 ;; Author: NIIBE Yutaka <gniibe@chroot.org>
 
@@ -147,8 +148,7 @@ Don't specify the optional arguments in normal use."
     (set-process-query-on-exit-flag proc nil)
     (set-process-coding-system proc 'binary 'binary)
     (set-marker-insertion-type (process-mark proc) t)
-    (save-excursion
-      (set-buffer buf)
+    (with-current-buffer buf
       (erase-buffer)
       (buffer-disable-undo)
       (set-buffer-multibyte nil))
@@ -175,8 +175,7 @@ Don't specify the optional arguments in normal use."
 ;;   (let* ((buf (generate-new-buffer " *SJ3*"))
 ;;      (msg-form "SJ3: connecting to sj3serv at %s...")
 ;;      hostname proc result msg)
-;;     (save-excursion
-;;       (set-buffer buf)
+;;     (with-current-buffer buf
 ;;       (erase-buffer)
 ;;       (buffer-disable-undo)
 ;;       (setq enable-multibyte-characters nil))

diff --git a/egg/sj3rpc.el b/egg/sj3rpc.el
index 5aa7d52..ca38af9 100644 (file)
--- a/egg/sj3rpc.el
+++ b/egg/sj3rpc.el
@@ -2,6 +2,7 @@
 ;;;                   Input Method Architecture
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc
+;;               2015 Hiroki Sato <hrs@allbsd.org>
 
 ;; Author: NIIBE Yutaka <gniibe@chroot.org>
 
@@ -84,8 +85,7 @@ SJ3 server.  Valid coding systems are depend on the server spec.")
     (list
      'let v
      (append
-       `(save-excursion
-          (set-buffer (process-buffer proc))
+       `(with-current-buffer (process-buffer proc)
           (erase-buffer)
           ,send-expr
           (process-send-region proc (point-min) (point-max))

diff --git a/egg/wnn.el b/egg/wnn.el
index 0123311..f61a48c 100644 (file)
--- a/egg/wnn.el
+++ b/egg/wnn.el
@@ -2,6 +2,7 @@
 ;;;                Input Method Architecture
 
 ;; Copyright (C) 1999,2000 PFU LIMITED
+;;               2015 Hiroki Sato <hrs@allbsd.org>
 
 ;; Author: NIIBE Yutaka <gniibe@chroot.org>
 ;;         KATAYAMA Yoshio <kate@pfu.co.jp>
@@ -140,7 +141,7 @@ by ':' and digit N."
 (defun wnn-make-backend (lang env &optional source-lang converted-lang)
   (let ((finalize (wnn-backend-func-name "wnn-finalize-backend" lang))
        (backend (wnn-backend-func-name "wnn-backend" lang env)))
-    (if (null (fboundp finalize))
+    (if (null (fboundp 'finalize))
        (progn
          (fset finalize `(lambda () (wnn-finalize-backend ',lang)))
          (egg-set-finalize-backend (list finalize))))
@@ -1233,8 +1234,7 @@ Return the list of bunsetsu."
     (unwind-protect
        (progn
          (setq buf (generate-new-buffer (wnn-server-buffer-name server-info)))
-         (save-excursion
-           (set-buffer buf)
+         (with-current-buffer buf
            (erase-buffer)
            (buffer-disable-undo)
            (set-buffer-multibyte nil)

diff --git a/egg/wnnrpc.el b/egg/wnnrpc.el
index 4edd0f9..b597043 100644 (file)
--- a/egg/wnnrpc.el
+++ b/egg/wnnrpc.el
@@ -2,6 +2,7 @@
 ;;;                   Input Method Architecture
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc
+;;               2015 Hiroki Sato <hrs@allbsd.org>
 
 ;; Author: NIIBE Yutaka <gniibe@chroot.org>
 ;;         KATAYAMA Yoshio <kate@pfu.co.jp> ; Korean, Chinese support.
@@ -1720,8 +1721,7 @@ HINSHI and FUZOKUGO are information of preceding bunsetsu."
                  (insert contents)
                  (if (= result 2)
                      (insert-file-contents local-filename nil (1- (point))))
-                 (save-excursion
-                   (set-buffer (process-buffer proc))
+                 (with-current-buffer (process-buffer proc)
                    (wnnrpc-get-result)))))))))
     ((quit error)
      (wnnrpc-call-with-environment env ()

diff --git a/menudiag.el b/menudiag.el
index fb25004..40a244c 100644 (file)
--- a/menudiag.el
+++ b/menudiag.el
@@ -629,8 +629,7 @@
 (defun menudiag-selection-goto-internal ()
   (let* ((list menudiag-goto-number-list)
         (n (menudiag-selection-item-number list))
-        (len (save-excursion
-               (set-buffer menudiag-selection-main-buffer)
+        (len (with-current-buffer menudiag-selection-main-buffer
                (length menudiag-current-items))))
     (setq this-command 'menudiag-selection-goto)
     (if (>= n len)