[Emacs-diffs] Changes to emacs/lisp/ido.el

[Kim F . Storm]

Index: emacs/lisp/ido.el
diff -c emacs/lisp/ido.el:1.80 emacs/lisp/ido.el:1.81
*** emacs/lisp/ido.el:1.80      Sat Nov 26 19:25:36 2005
--- emacs/lisp/ido.el   Wed Dec  7 09:22:53 2005
***************
*** 252,258 ****
  ;;
  ;;(defun ido-my-keys ()
  ;;  "Add my keybindings for ido."
! ;;  (define-key ido-mode-map " " 'ido-next-match)
  ;;  )
  
  ;; Seeing all the matching buffers or files
--- 252,258 ----
  ;;
  ;;(defun ido-my-keys ()
  ;;  "Add my keybindings for ido."
! ;;  (define-key ido-completion-map " " 'ido-next-match)
  ;;  )
  
  ;; Seeing all the matching buffers or files
***************
*** 716,722 ****
    "*Hook run after the ido variables and keymap have been setup.
  The dynamic variable `ido-cur-item' contains the current type of item that
  is read by ido, possible values are file, dir, buffer, and list.
! Additional keys can be defined in `ido-mode-map'."
    :type 'hook
    :group 'ido)
  
--- 716,722 ----
    "*Hook run after the ido variables and keymap have been setup.
  The dynamic variable `ido-cur-item' contains the current type of item that
  is read by ido, possible values are file, dir, buffer, and list.
! Additional keys can be defined in `ido-completion-map'."
    :type 'hook
    :group 'ido)
  
***************
*** 898,916 ****
  
  ;; Persistent variables
  
! (defvar ido-mode-map nil
    "Currently active keymap for ido commands.")
  
! (defvar ido-mode-common-map nil
    "Keymap for all ido commands.")
  
! (defvar ido-mode-file-map nil
    "Keymap for ido file commands.")
  
! (defvar ido-mode-file-dir-map nil
    "Keymap for ido file and directory commands.")
  
! (defvar ido-mode-buffer-map nil
    "Keymap for ido buffer commands.")
  
  (defvar  ido-file-history nil
--- 898,916 ----
  
  ;; Persistent variables
  
! (defvar ido-completion-map nil
    "Currently active keymap for ido commands.")
  
! (defvar ido-common-completion-map nil
    "Keymap for all ido commands.")
  
! (defvar ido-file-completion-map nil
    "Keymap for ido file commands.")
  
! (defvar ido-file-dir-completion-map nil
    "Keymap for ido file and directory commands.")
  
! (defvar ido-buffer-completion-map nil
    "Keymap for ido buffer commands.")
  
  (defvar  ido-file-history nil
***************
*** 1345,1351 ****
  
    (ido-everywhere (if ido-everywhere 1 -1))
    (when ido-mode
!     (ido-init-mode-maps))
  
    (when ido-mode
      (add-hook 'minibuffer-setup-hook 'ido-minibuffer-setup)
--- 1345,1351 ----
  
    (ido-everywhere (if ido-everywhere 1 -1))
    (when ido-mode
!     (ido-init-completion-maps))
  
    (when ido-mode
      (add-hook 'minibuffer-setup-hook 'ido-minibuffer-setup)
***************
*** 1354,1365 ****
  
      (add-hook 'kill-emacs-hook 'ido-kill-emacs-hook)
  
!     (if ido-minor-mode-map-entry
!       (setcdr ido-minor-mode-map-entry (make-sparse-keymap))
!       (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))
        (define-key map [remap find-file] 'ido-find-file)
        (define-key map [remap find-file-read-only] 'ido-find-file-read-only)
--- 1354,1360 ----
  
      (add-hook 'kill-emacs-hook 'ido-kill-emacs-hook)
  
!     (let ((map (make-sparse-keymap)))
        (when (memq ido-mode '(file both))
        (define-key map [remap find-file] 'ido-find-file)
        (define-key map [remap find-file-read-only] 'ido-find-file-read-only)
***************
*** 1379,1385 ****
        (define-key map [remap switch-to-buffer-other-frame] 
'ido-switch-buffer-other-frame)
        (define-key map [remap insert-buffer] 'ido-insert-buffer)
        (define-key map [remap kill-buffer] 'ido-kill-buffer)
!       (define-key map [remap display-buffer] 'ido-display-buffer)))))
  
  (defun ido-everywhere (arg)
    "Toggle using ido speed-ups everywhere file and directory names are read.
--- 1374,1386 ----
        (define-key map [remap switch-to-buffer-other-frame] 
'ido-switch-buffer-other-frame)
        (define-key map [remap insert-buffer] 'ido-insert-buffer)
        (define-key map [remap kill-buffer] 'ido-kill-buffer)
!       (define-key map [remap display-buffer] 'ido-display-buffer))
! 
!       (if ido-minor-mode-map-entry
!         (setcdr ido-minor-mode-map-entry map)
!       (setq ido-minor-mode-map-entry (cons 'ido-mode map))
!       (add-to-list 'minor-mode-map-alist ido-minor-mode-map-entry)))))
! 
  
  (defun ido-everywhere (arg)
    "Toggle using ido speed-ups everywhere file and directory names are read.
***************
*** 1404,1411 ****
  
  
  ;;; IDO KEYMAP
! (defun ido-init-mode-maps ()
!   "Set up the keymaps used by `ido'."
  
    ;; Common map
    (let ((map (make-sparse-keymap)))
--- 1405,1412 ----
  
  
  ;;; IDO KEYMAP
! (defun ido-init-completion-maps ()
!   "Set up the completion keymaps used by `ido'."
  
    ;; Common map
    (let ((map (make-sparse-keymap)))
***************
*** 1431,1437 ****
      (define-key map "\C-f" 'ido-magic-forward-char)
      (define-key map "\C-d" 'ido-magic-delete-char)
      (set-keymap-parent map minibuffer-local-map)
!     (setq ido-mode-common-map map))
  
    ;; File and directory map
    (let ((map (make-sparse-keymap)))
--- 1432,1438 ----
      (define-key map "\C-f" 'ido-magic-forward-char)
      (define-key map "\C-d" 'ido-magic-delete-char)
      (set-keymap-parent map minibuffer-local-map)
!     (setq ido-common-completion-map map))
  
    ;; File and directory map
    (let ((map (make-sparse-keymap)))
***************
*** 1457,1464 ****
      (define-key map [(meta control ?o)] 'ido-next-work-file)
      (define-key map [(meta ?p)] 'ido-prev-work-directory)
      (define-key map [(meta ?s)] 'ido-merge-work-directories)
!     (set-keymap-parent map ido-mode-common-map)
!     (setq ido-mode-file-dir-map map))
  
    ;; File only map
    (let ((map (make-sparse-keymap)))
--- 1458,1465 ----
      (define-key map [(meta control ?o)] 'ido-next-work-file)
      (define-key map [(meta ?p)] 'ido-prev-work-directory)
      (define-key map [(meta ?s)] 'ido-merge-work-directories)
!     (set-keymap-parent map ido-common-completion-map)
!     (setq ido-file-dir-completion-map map))
  
    ;; File only map
    (let ((map (make-sparse-keymap)))
***************
*** 1467,1485 ****
      (define-key map "\C-w" 'ido-copy-current-file-name)
      (define-key map [(meta ?l)] 'ido-toggle-literal)
      (define-key map "\C-v" 'ido-toggle-vc)
!     (set-keymap-parent map ido-mode-file-dir-map)
!     (setq ido-mode-file-map map))
  
    ;; Buffer map
    (let ((map (make-sparse-keymap)))
      (define-key map "\C-x\C-f" 'ido-enter-find-file)
      (define-key map "\C-x\C-b" 'ido-fallback-command)
      (define-key map "\C-k" 'ido-kill-buffer-at-head)
!     (set-keymap-parent map ido-mode-common-map)
!     (setq ido-mode-buffer-map map)))
  
  
! (defun ido-define-mode-map ()
    "Set up the keymap for `ido'."
  
    ;; generated every time so that it can inherit new functions.
--- 1468,1486 ----
      (define-key map "\C-w" 'ido-copy-current-file-name)
      (define-key map [(meta ?l)] 'ido-toggle-literal)
      (define-key map "\C-v" 'ido-toggle-vc)
!     (set-keymap-parent map ido-file-dir-completion-map)
!     (setq ido-file-completion-map map))
  
    ;; Buffer map
    (let ((map (make-sparse-keymap)))
      (define-key map "\C-x\C-f" 'ido-enter-find-file)
      (define-key map "\C-x\C-b" 'ido-fallback-command)
      (define-key map "\C-k" 'ido-kill-buffer-at-head)
!     (set-keymap-parent map ido-common-completion-map)
!     (setq ido-buffer-completion-map map)))
  
  
! (defun ido-setup-completion-map ()
    "Set up the keymap for `ido'."
  
    ;; generated every time so that it can inherit new functions.
***************
*** 1500,1517 ****
        (define-key map [remap viper-delete-backward-word] 
'ido-delete-backward-word-updir))
        (set-keymap-parent map
                         (if (eq ido-cur-item 'file)
!                            ido-mode-file-map
!                          ido-mode-file-dir-map)))
  
       ((eq ido-cur-item 'buffer)
        (when ido-context-switch-command
        (define-key map "\C-x\C-f" ido-context-switch-command))
!       (set-keymap-parent map ido-mode-buffer-map))
  
       (t
!       (set-keymap-parent map ido-mode-common-map)))
  
!     (setq ido-mode-map map)))
  
  (defun ido-final-slash (dir &optional fix-it)
    ;; return DIR if DIR has final slash.
--- 1501,1518 ----
        (define-key map [remap viper-delete-backward-word] 
'ido-delete-backward-word-updir))
        (set-keymap-parent map
                         (if (eq ido-cur-item 'file)
!                            ido-file-completion-map
!                          ido-file-dir-completion-map)))
  
       ((eq ido-cur-item 'buffer)
        (when ido-context-switch-command
        (define-key map "\C-x\C-f" ido-context-switch-command))
!       (set-keymap-parent map ido-buffer-completion-map))
  
       (t
!       (set-keymap-parent map ido-common-completion-map)))
  
!     (setq ido-completion-map map)))
  
  (defun ido-final-slash (dir &optional fix-it)
    ;; return DIR if DIR has final slash.
***************
*** 1683,1689 ****
         (ido-enable-regexp ido-enable-regexp)
         )
  
!     (ido-define-mode-map)
      (setq ido-text-init initial)
      (setq ido-input-stack nil)
  
--- 1684,1690 ----
         (ido-enable-regexp ido-enable-regexp)
         )
  
!     (ido-setup-completion-map)
      (setq ido-text-init initial)
      (setq ido-input-stack nil)
  
***************
*** 1788,1794 ****
        (if (and ido-matches (eq ido-try-merged-list 'auto))
          (setq ido-try-merged-list t))
        (let
!         ((minibuffer-local-completion-map ido-mode-map)
           (max-mini-window-height (or ido-max-window-height
                                       (and (boundp 'max-mini-window-height) 
max-mini-window-height)))
           (ido-completing-read t)
--- 1789,1796 ----
        (if (and ido-matches (eq ido-try-merged-list 'auto))
          (setq ido-try-merged-list t))
        (let
!         ((minibuffer-local-completion-map ido-completion-map)
!          (minibuffer-local-filename-completion-map ido-completion-map)
           (max-mini-window-height (or ido-max-window-height
                                       (and (boundp 'max-mini-window-height) 
max-mini-window-height)))
           (ido-completing-read t)
***************
*** 3670,3676 ****
  displayed if substring-matching is used \(default). Look at
  `ido-enable-prefix' and `ido-toggle-prefix'.  When you have found the
  buffer you want, it can then be selected.  As you type, most keys have
! their normal keybindings, except for the following: \\<ido-mode-buffer-map>
  
  RET Select the buffer at the front of the list of matches.  If the
  list is empty, possibly prompt to create new buffer.
--- 3672,3678 ----
  displayed if substring-matching is used \(default). Look at
  `ido-enable-prefix' and `ido-toggle-prefix'.  When you have found the
  buffer you want, it can then be selected.  As you type, most keys have
! their normal keybindings, except for the following: 
\\<ido-buffer-completion-map>
  
  RET Select the buffer at the front of the list of matches.  If the
  list is empty, possibly prompt to create new buffer.
***************
*** 3758,3764 ****
  if substring-matching is used \(default).  Look at `ido-enable-prefix' and
  `ido-toggle-prefix'.  When you have found the filename you want, it can
  then be selected.  As you type, most keys have their normal keybindings,
! except for the following: \\<ido-mode-file-map>
  
  RET Select the file at the front of the list of matches.  If the
  list is empty, possibly prompt to create new file.
--- 3760,3766 ----
  if substring-matching is used \(default).  Look at `ido-enable-prefix' and
  `ido-toggle-prefix'.  When you have found the filename you want, it can
  then be selected.  As you type, most keys have their normal keybindings,
! except for the following: \\<ido-file-completion-map>
  
  RET Select the file at the front of the list of matches.  If the
  list is empty, possibly prompt to create new file.