emacs: lisp/ido.el comparison

comparison lisp/ido.el @ 90182:f042e7c0fe20

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-53 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 302-319) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 69) - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Fri, 20 May 2005 04:22:05 +0000
parents	62afea0771d8 43a311177040
children	01137c1fdbe9

comparison

equal deleted inserted replaced

-:0c828e2b0b6f
+:f042e7c0fe20
 (define-key map [(control ?@)] 'ido-restrict-to-matches)
 (define-key map [right] 'ido-next-match)
 (define-key map [left] 'ido-prev-match)
 (define-key map "?" 'ido-completion-help)
+;; Magic commands.
+(define-key map "\C-b" 'ido-magic-backward-char)
+(define-key map "\C-f" 'ido-magic-forward-char)
+(define-key map "\C-d" 'ido-magic-delete-char)
 (when (memq ido-cur-item '(file dir))
-(define-key map "\C-b" (or ido-context-switch-command 'ido-enter-switch-buffer))
+(define-key map "\C-x\C-b" (or ido-context-switch-command 'ido-enter-switch-buffer))
-(define-key map "\C-d" (or (and ido-context-switch-command 'ignore) 'ido-enter-dired))
+(define-key map "\C-x\C-f" 'ido-fallback-command)
-(define-key map "\C-f" 'ido-fallback-command)
+(define-key map "\C-x\C-d" (or (and ido-context-switch-command 'ignore) 'ido-enter-dired))
 (define-key map [down] 'ido-next-match-dir)
 (define-key map [up]   'ido-prev-match-dir)
 (define-key map [(meta up)] 'ido-prev-work-directory)
 (define-key map [(meta down)] 'ido-next-work-directory)
 (define-key map [backspace] 'ido-delete-backward-updir)
 (define-key map "\d"        'ido-delete-backward-updir)
 (define-key map [(meta backspace)] 'ido-delete-backward-word-updir)
 (define-key map [(control backspace)] 'ido-up-directory)
 (define-key map "\C-l" 'ido-reread-directory)
-(define-key map [(meta ?d)] 'ido-wide-find-dir)
+(define-key map [(meta ?d)] 'ido-wide-find-dir-or-delete-dir)
 (define-key map [(meta ?b)] 'ido-push-dir)
 (define-key map [(meta ?f)] 'ido-wide-find-file-or-pop-dir)
 (define-key map [(meta ?k)] 'ido-forget-work-directory)
 (define-key map [(meta ?m)] 'ido-make-directory)
 (define-key map [(meta ?n)] 'ido-next-work-directory)
 (define-key map [(meta ?l)] 'ido-toggle-literal)
 (define-key map "\C-v" 'ido-toggle-vc)
 )
 (when (eq ido-cur-item 'buffer)
-(define-key map "\C-f" (or ido-context-switch-command 'ido-enter-find-file))
+(define-key map "\C-x\C-f" (or ido-context-switch-command 'ido-enter-find-file))
-(define-key map "\C-b" 'ido-fallback-command)
+(define-key map "\C-x\C-b" 'ido-fallback-command)
 (define-key map "\C-k" 'ido-kill-buffer-at-head)
 )
 (when (if (boundp 'viper-mode) viper-mode)
 (define-key map [remap viper-intercept-ESC-key] 'ignore)
 (ido-matches
 (setq ido-try-merged-list t))
 ((not ido-use-merged-list)
 (ido-merge-work-directories))))
+;;; Magic C-f
+(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
+(defun ido-magic-delete-char ()
+"Delete following char in user input or perform magic action.
+If at end of user input, perform magic actions:
+C-x C-f ... C-d  enter dired on current directory."
+(interactive)
+(cond
+((not (eobp))
+(delete-char 1))
+(ido-context-switch-command
+nil)
+((memq ido-cur-item '(file dir))
+(ido-enter-dired))))
 ;;; TOGGLE FUNCTIONS
 (defun ido-toggle-case ()
 "Toggle the value of `ido-case-fold'."
 (interactive)
 (setq ido-use-merged-list t ido-try-merged-list 'wide)
 (setq ido-exit 'refresh)
 (setq ido-text-init (ido-final-slash dir t))
 (setq ido-rotate-temp t)
 (exit-minibuffer)))
+(defun ido-wide-find-dir-or-delete-dir (&optional dir)
+"Prompt for DIR to search for using find, starting from current directory.
+If input stack is non-empty, delete current directory component."
+(interactive)
+(if ido-input-stack
+(ido-delete-backward-word-updir 1)
+(ido-wide-find-dir)))
 (defun ido-push-dir ()
 "Move to previous directory in file name, push current input on stack."
 (interactive)
 (setq ido-exit 'push)
 (ido-to-end summaries)))
 ;;; Helper functions for other programs
 (put 'dired-do-rename 'ido 'ignore)
+(put 'ibuffer-find-file 'ido 'find-file)
 ;;;###autoload
 (defun ido-read-buffer (prompt &optional default require-match)
 "Ido replacement for the built-in `read-buffer'.
 Return the name of a buffer selected.
 	    (ido-read-directory-name prompt dir default-filename mustmatch initial)))
 ((and (not (eq (get this-command 'ido) 'ignore))
 	   (not (memq this-command ido-read-file-name-non-ido))
 	   (or (null predicate) (eq predicate 'file-exists-p)))
 (let* (ido-saved-vc-hb
-	     (ido-context-switch-command 'ignore)
+	     (ido-context-switch-command
+	      (if (eq (get this-command 'ido) 'find-file) nil 'ignore))
 	     (vc-handled-backends (and (boundp 'vc-handled-backends) vc-handled-backends))
 	     (ido-current-directory (ido-expand-directory dir))
 	     (ido-directory-nonreadable (not (file-readable-p ido-current-directory)))
 	     (ido-directory-too-big (and (not ido-directory-nonreadable)
 					 (ido-directory-too-big-p ido-current-directory)))
 	(setq filename
 	      (ido-read-internal 'file prompt 'ido-file-history default-filename mustmatch initial))
 	(cond
 	 ((eq ido-exit 'fallback)
 	  (setq filename 'fallback))
+	 ((eq ido-exit 'dired)
+	  (setq filename ido-current-directory))
 	 (filename
 	  (setq filename
 		(concat ido-current-directory filename))))))
 (t
 (setq filename 'fallback)))

Mercurial > emacs

comparison lisp/ido.el @ 90182:f042e7c0fe20