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

Import from CVS: tag r21-2-7
author cvs
date Mon, 13 Aug 2007 11:08:24 +0200
parents d883f39b8495
children 74fd4e045ea6
comparison
equal deleted inserted replaced
383:6a50c6a581a5 384:bbff43aa5eb7
453 isearch-opoint (point) 453 isearch-opoint (point)
454 isearch-window-configuration (current-window-configuration) 454 isearch-window-configuration (current-window-configuration)
455 455
456 ;; #### Should we remember the old value of 456 ;; #### Should we remember the old value of
457 ;; overriding-local-map? 457 ;; overriding-local-map?
458 overriding-local-map isearch-mode-map 458 overriding-local-map (progn
459 (set-keymap-parents isearch-mode-map
460 (nconc (current-minor-mode-maps)
461 (and (current-local-map)
462 (list (current-local-map)))))
463 isearch-mode-map)
459 isearch-selected-frame (selected-frame) 464 isearch-selected-frame (selected-frame)
460 465
461 isearch-mode (gettext " Isearch") 466 isearch-mode (gettext " Isearch")
462 ) 467 )
463 (let ((map (append (current-minor-mode-maps)
464 (list (current-local-map)))))
465 (if (keymapp map)
466 (set-keymap-parents isearch-mode-map map)))
467 468
468 ;; XEmacs change: without clearing the match data, sometimes old values 469 ;; XEmacs change: without clearing the match data, sometimes old values
469 ;; of isearch-other-end get used. Don't ask me why... 470 ;; of isearch-other-end get used. Don't ask me why...
470 (store-match-data nil) 471 (store-match-data nil)
471 472