Mercurial > emacs
changeset 62537:43a311177040
(ido-magic-forward-char): Enter ido-find-file at end of input.
(ido-magic-backward-char): Enter ido-switch-buffer at start of input.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Thu, 19 May 2005 21:08:14 +0000 |
parents | d8f2a91300fa |
children | 431e1a995da5 |
files | lisp/ido.el |
diffstat | 1 files changed, 22 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ido.el Thu May 19 21:07:59 2005 +0000 +++ b/lisp/ido.el Thu May 19 21:08:14 2005 +0000 @@ -2267,31 +2267,41 @@ (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." +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)) - ((and (= (length ido-text) 0) - (memq ido-cur-item '(file dir))) - (ido-fallback-command)))) + ((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, perform magic actions: +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 - ((> (length ido-text) 0) - (if (> (point) (minibuffer-prompt-end)) - (forward-char -1))) + ((> (point) (minibuffer-prompt-end)) + (forward-char -1)) ((eq ido-cur-item 'buffer) - (ido-fallback-command)))) + (ido-fallback-command)) + (ido-context-switch-command + (call-interactively ido-context-switch-command)) + (t + (ido-enter-switch-buffer)))) ;;; Magic C-d