[Emacs-diffs] trunk r115391: * lisp/isearch.el (isearch--saved-overriding-local-map): New internal variable.

[Juri Linkov]

------------------------------------------------------------
revno: 115391
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16035
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-12-06 02:55:20 +0200
message:
  * lisp/isearch.el (isearch--saved-overriding-local-map): New internal 
variable.
  (isearch-mode): Set it to the initial value of 
`overriding-terminal-local-map'.
  (isearch-pre-command-hook): Compare `overriding-terminal-local-map'
  with `isearch--saved-overriding-local-map'.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/isearch.el                isearch.el-20091113204419-o5vbwnq5f7feedwu-486

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-06 00:48:52 +0000
+++ b/lisp/ChangeLog    2013-12-06 00:55:20 +0000
@@ -1,3 +1,12 @@
+2013-12-06  Juri Linkov  <address@hidden>
+
+       * isearch.el (isearch--saved-overriding-local-map):
+       New internal variable.
+       (isearch-mode): Set it to the initial value of
+       `overriding-terminal-local-map'.
+       (isearch-pre-command-hook): Compare `overriding-terminal-local-map'
+       with `isearch--saved-overriding-local-map'.  (Bug#16035)
+
 2013-12-06  Dmitry Gutov  <address@hidden>
 
        * progmodes/octave.el (inferior-octave-completion-table): Turn

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2013-12-04 00:12:02 +0000
+++ b/lisp/isearch.el   2013-12-06 00:55:20 +0000
@@ -637,6 +637,8 @@
 ;; isearch is invoked.
 (defvar isearch-input-method-local-p nil)
 
+(defvar isearch--saved-overriding-local-map nil)
+
 ;; Minor-mode-alist changes - kind of redundant with the
 ;; echo area, but if isearching in multiple windows, it can be useful.
 
@@ -904,6 +906,9 @@
 
   (setq overriding-terminal-local-map isearch-mode-map)
   (run-hooks 'isearch-mode-hook)
+  ;; Remember the initial map possibly modified
+  ;; by external packages in isearch-mode-hook.  (Bug#16035)
+  (setq isearch--saved-overriding-local-map overriding-terminal-local-map)
 
   ;; Pushing the initial state used to be before running isearch-mode-hook,
   ;; but a hook might set `isearch-push-state-function' used in
@@ -2235,7 +2240,7 @@
     (cond
      ;; Don't exit Isearch if we're in the middle of some
      ;; set-temporary-overlay-map thingy like universal-argument--mode.
-     ((not (eq overriding-terminal-local-map isearch-mode-map)))
+     ((not (eq overriding-terminal-local-map 
isearch--saved-overriding-local-map)))
      ;; Don't exit Isearch for isearch key bindings.
      ((commandp (lookup-key isearch-mode-map key nil)))
      ;; Optionally edit the search string instead of exiting.