X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fisearch-mode.el;h=cc5b3fa8287ee7539e2f83a2ea5a6f5a896af170;hb=89cfab686d6faed92ea20ab29470c05d56a03aa2;hp=8a611f2e55573ae0772e9c0168c0f18450fd9406;hpb=fc475e6669a613cd6d98eb5511c749a23b63c7ac;p=chise%2Fxemacs-chise.git

diff --git a/lisp/isearch-mode.el b/lisp/isearch-mode.el
index 8a611f2..cc5b3fa 100644
--- a/lisp/isearch-mode.el
+++ b/lisp/isearch-mode.el
@@ -455,15 +455,16 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
 
 	  ;; #### 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...