summaryrefslogtreecommitdiff
path: root/editors/tamago/files/patch-egg.el
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2015-01-31 11:32:42 +0000
committerHiroki Sato <hrs@FreeBSD.org>2015-01-31 11:32:42 +0000
commit47129a3d1c47fcc9600c629b8229a18543217a3d (patch)
treed7051a44840f331027cf76c27de7d0544bdedfc8 /editors/tamago/files/patch-egg.el
parentUpdate autogen to 5.18.4. (diff)
- Fix a bug that deactivate-input-method was not called in
(egg-exit-from-minibuffer). - Remove an unnecessary overriding-local-map call in (menudiag-select-internal). - Regenerate patch files.
Diffstat (limited to 'editors/tamago/files/patch-egg.el')
-rw-r--r--editors/tamago/files/patch-egg.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/editors/tamago/files/patch-egg.el b/editors/tamago/files/patch-egg.el
index 7243a34ecced..ad417ebeec3f 100644
--- a/editors/tamago/files/patch-egg.el
+++ b/editors/tamago/files/patch-egg.el
@@ -1,5 +1,5 @@
---- egg.el.orig 2013-05-05 14:02:05.000000000 +0900
-+++ egg.el 2013-05-05 14:02:05.000000000 +0900
+--- egg.el.orig 2015-01-31 19:24:09.000000000 +0900
++++ egg.el 2015-01-31 19:48:25.000000000 +0900
@@ -167,16 +167,22 @@
(setq egg-modefull-mode t)
(its-define-select-keys egg-modefull-map))
@@ -21,8 +21,8 @@
(defun egg-exit-from-minibuffer ()
- (inactivate-input-method)
+ (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)))