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

[Kim F . Storm]

Index: emacs/lisp/ido.el
diff -c emacs/lisp/ido.el:1.56 emacs/lisp/ido.el:1.57
*** emacs/lisp/ido.el:1.56      Sun May 15 23:03:36 2005
--- emacs/lisp/ido.el   Thu May 19 21:08:14 2005
***************
*** 2267,2297 ****
  
  (defun ido-magic-forward-char ()
    "Move forward in user input or perform magic action.
! If no user input is present, perform magic actions:
! C-x C-f C-f  fallback to non-ido find-file.
! C-x C-d C-f  fallback to non-ido brief dired.
! C-x d C-f    fallback to non-ido dired."
    (interactive)
    (cond
     ((not (eobp))
      (forward-char 1))
!    ((and (= (length ido-text) 0)
!        (memq ido-cur-item '(file dir)))
!     (ido-fallback-command))))
  
  ;;; Magic C-b
  
  (defun ido-magic-backward-char ()
    "Move backward in user input or perform magic action.
! If no user input is present, perform magic actions:
  C-x C-b C-b  fallback to non-ido switch-to-buffer."
    (interactive)
    (cond
!    ((> (length ido-text) 0)
!     (if (> (point) (minibuffer-prompt-end))
!       (forward-char -1)))
     ((eq ido-cur-item 'buffer)
!     (ido-fallback-command))))
  
  ;;; Magic C-d
  
--- 2267,2307 ----
  
  (defun ido-magic-forward-char ()
    "Move forward in user input or perform magic action.
! If no user input is present or at end of input, perform magic actions:
! C-x C-b ... C-f  switch to ido-find-file.
! C-x C-f ... C-f  fallback to non-ido find-file.
! C-x C-d ... C-f  fallback to non-ido brief dired.
! C-x d ... C-f    fallback to non-ido dired."
    (interactive)
    (cond
     ((not (eobp))
      (forward-char 1))
!    ((memq ido-cur-item '(file dir))
!     (ido-fallback-command))
!    (ido-context-switch-command
!     (call-interactively ido-context-switch-command))
!    ((eq ido-cur-item 'buffer)
!     (ido-enter-find-file))))
  
  ;;; Magic C-b
  
  (defun ido-magic-backward-char ()
    "Move backward in user input or perform magic action.
! If no user input is present, or at start of input, perform magic actions:
! C-x C-f C-b  switch to ido-switch-buffer.
! C-x C-d C-b  switch to ido-switch-buffer.
! C-x d C-b    switch to ido-switch-buffer.
  C-x C-b C-b  fallback to non-ido switch-to-buffer."
    (interactive)
    (cond
!    ((> (point) (minibuffer-prompt-end))
!     (forward-char -1))
     ((eq ido-cur-item 'buffer)
!     (ido-fallback-command))
!    (ido-context-switch-command
!     (call-interactively ido-context-switch-command))
!    (t
!     (ido-enter-switch-buffer))))
  
  ;;; Magic C-d