diff options
Diffstat (limited to 'editors/tamago/files/patch-egg.el')
| -rw-r--r-- | editors/tamago/files/patch-egg.el | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/editors/tamago/files/patch-egg.el b/editors/tamago/files/patch-egg.el index ad417ebeec3f..91e85c950809 100644 --- a/editors/tamago/files/patch-egg.el +++ b/editors/tamago/files/patch-egg.el @@ -1,11 +1,26 @@ --- egg.el.orig 2015-01-31 19:24:09.000000000 +0900 -+++ egg.el 2015-01-31 19:48:25.000000000 +0900 ++++ egg.el 2015-02-02 00:38:37.000000000 +0900 +@@ -120,10 +120,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)) + @@ -167,16 +167,22 @@ (setq egg-modefull-mode t) (its-define-select-keys egg-modefull-map)) (setq egg-modeless-mode t)) - (setq inactivate-current-input-method-function 'egg-mode) -+ (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) @@ -20,7 +35,7 @@ (defun egg-exit-from-minibuffer () - (inactivate-input-method) -+ (if (boundp 'deactivate-input-method) ++ (if (fboundp 'deactivate-input-method) + (deactivate-input-method) + (inactivate-input-method)) (if (<= (minibuffer-depth) 1) |