apply a patch from Hiroki Sato <hrs@allbsd.org>

* egg.el(egg-exit-from-minibuffer): applied patch from
Hiroki Sato <hrs@allbsd.org>.
He found a modified leak in tamago-tsunagi.
https://sourceforge.jp/projects/tamago-tsunagi/lists/archive/misc/2015-February/000085.html

	modified:   ChangeLog
	modified:   egg.el

diff --git a/ChangeLog b/ChangeLog
index 972e248..678b891 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-01  Mitsutoshi NAKANO  <bkbin005@rinku.zaq.ne.jp>
+
+       * egg.el(egg-exit-from-minibuffer): applied patch from
+       Hiroki Sato <hrs@allbsd.org>.
+       He found a modified leak in tamago-tsunagi.
+       https://sourceforge.jp/projects/tamago-tsunagi/lists/archive/misc/2015-February/000085.html
+
 2015-01-31  Mitsutoshi NAKANO  <bkbin005@rinku.zaq.ne.jp>
 
        * Makefile.in(datarootdir): defined @datarootdir@, fixed #34855

diff --git a/egg.el b/egg.el
index 56e68ae..ca4dbdc 100644 (file)
--- a/egg.el
+++ b/egg.el
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 1999-2015 Free Software Foundation, Inc
 ;;               2014, 2015 Mitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp>
+;;               2015 Hiroki Sato <hrs@allbsd.org>
 
 ;; Author: NIIBE Yutaka <gniibe@chroot.org>
 ;;         KATAYAMA Yoshio <kate@pfu.co.jp>
@@ -183,8 +184,8 @@
 
 (defun egg-exit-from-minibuffer ()
   (if (boundp 'deactivate-input-method)
-      deactivate-input-method
-    inactivate-input-method)
+      (deactivate-input-method)
+    (inactivate-input-method))
   (if (<= (minibuffer-depth) 1)
       (remove-hook 'minibuffer-exit-hook 'egg-exit-from-minibuffer)))