*** ido.el	14 Jun 2005 06:25:37 +0200	1.61
--- ido.el	14 Jun 2005 07:24:49 +0200	
***************
*** 1320,1328 ****
  
      (add-hook 'kill-emacs-hook 'ido-kill-emacs-hook)
  
!     (unless ido-minor-mode-map-entry
!       (setq ido-minor-mode-map-entry (cons 'ido-mode (make-sparse-keymap)))
!       (add-to-list 'minor-mode-map-alist ido-minor-mode-map-entry))
  
      (let ((map (cdr ido-minor-mode-map-entry)))
        (when (memq ido-mode '(file both))
--- 1320,1330 ----
  
      (add-hook 'kill-emacs-hook 'ido-kill-emacs-hook)
  
!     ;; Rebuild the keymap each time so that old bindings are not retained.
!     ;; This is necessary when switching from `both' to either `buffer' or `file'.
!     (setq ido-minor-mode-map-entry (cons 'ido-mode (make-sparse-keymap)))
!     (setq minor-mode-map-alist (assq-delete-all 'ido-mode minor-mode-map-alist))
!     (add-to-list 'minor-mode-map-alist ido-minor-mode-map-entry)
  
      (let ((map (cdr ido-minor-mode-map-entry)))
        (when (memq ido-mode '(file both))