Mercurial > hg > xemacs-beta

diff lisp/isearch-mode.el @ 384:bbff43aa5eb7 r21-2-7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-7
author cvs
date Mon, 13 Aug 2007 11:08:24 +0200
parents d883f39b8495
children 74fd4e045ea6
line wrap: on
line diff
--- a/lisp/isearch-mode.el	Mon Aug 13 11:07:40 2007 +0200
+++ b/lisp/isearch-mode.el	Mon Aug 13 11:08:24 2007 +0200
@@ -455,15 +455,16 @@
 
 	  ;; #### Should we remember the old value of
 	  ;; overriding-local-map?
-	  overriding-local-map isearch-mode-map
+ 	  overriding-local-map (progn
+ 				 (set-keymap-parents isearch-mode-map
+ 				  (nconc (current-minor-mode-maps)
+					 (and (current-local-map)
+					      (list (current-local-map)))))
+ 				 isearch-mode-map)
 	  isearch-selected-frame (selected-frame)
 
 	  isearch-mode (gettext " Isearch")
 	  )
-    (let ((map (append (current-minor-mode-maps)
-		       (list (current-local-map)))))
-      (if (keymapp map)
-	  (set-keymap-parents isearch-mode-map map)))
 
     ;; XEmacs change: without clearing the match data, sometimes old values
     ;; of isearch-other-end get used.  Don't ask me why...