diff options
Diffstat (limited to 'lisp/ido.el')
| -rw-r--r-- | lisp/ido.el | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/lisp/ido.el b/lisp/ido.el index 2df9b8666a..d1f2cea83f 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -1,7 +1,6 @@ ;;; ido.el --- interactively do things with buffers and files. -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1996-2011 Free Software Foundation, Inc. ;; Author: Kim F. Storm <[email protected]> ;; Based on: iswitchb by Stephen Eglen <[email protected]> @@ -1289,8 +1288,6 @@ Only used if `ido-use-virtual-buffers' is non-nil.") (defun ido-may-cache-directory (&optional dir) (setq dir (or dir ido-current-directory)) (cond - ((ido-directory-too-big-p dir) - nil) ((and (ido-is-root-directory dir) (or ido-enable-tramp-completion (memq system-type '(windows-nt ms-dos)))) @@ -1299,6 +1296,8 @@ Only used if `ido-use-virtual-buffers' is non-nil.") (ido-cache-unc-valid)) ((ido-is-ftp-directory dir) (ido-cache-ftp-valid)) + ((ido-directory-too-big-p dir) + nil) (t t))) (defun ido-pp (list &optional sep) @@ -1467,6 +1466,11 @@ Removes badly formatted data and ignored directories." ;; ido kill emacs hook (ido-save-history)) +(defun ido-common-initialization () + (ido-init-completion-maps) + (add-hook 'minibuffer-setup-hook 'ido-minibuffer-setup) + (add-hook 'choose-completion-string-functions 'ido-choose-completion-string)) + (define-minor-mode ido-everywhere "Toggle using ido speed-ups everywhere file and directory names are read. With ARG, turn ido speed-up on if arg is positive, off otherwise." @@ -1510,12 +1514,9 @@ This function also adds a hook to the minibuffer." (t nil))) (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) - (add-hook 'choose-completion-string-functions 'ido-choose-completion-string) + (ido-common-initialization) (ido-load-history) (add-hook 'kill-emacs-hook 'ido-kill-emacs-hook) @@ -2428,7 +2429,7 @@ If cursor is not at the end of the user input, move to end of input." (ido-record-command 'write-file filename) (add-to-history 'file-name-history filename) (ido-record-work-directory) - (write-file filename)) + (write-file filename t)) ((eq method 'read-only) (ido-record-work-file filename) @@ -3070,8 +3071,8 @@ If repeated, insert text from buffer instead." (if ido-matches (let ((next (cadr ido-matches))) (setq ido-cur-list (ido-chop ido-cur-list next)) - (setq ido-rescan t) - (setq ido-rotate t)))) + (setq ido-matches (ido-chop ido-matches next)) + (setq ido-rescan nil)))) (defun ido-prev-match () "Put last element of `ido-matches' at the front of the list." @@ -3079,8 +3080,8 @@ If repeated, insert text from buffer instead." (if ido-matches (let ((prev (car (last ido-matches)))) (setq ido-cur-list (ido-chop ido-cur-list prev)) - (setq ido-rescan t) - (setq ido-rotate t)))) + (setq ido-matches (ido-chop ido-matches prev)) + (setq ido-rescan nil)))) (defun ido-next-match-dir () "Find next directory in match list. @@ -4759,6 +4760,8 @@ DEF, if non-nil, is the default value." (ido-directory-too-big nil) (ido-context-switch-command 'ignore) (ido-choice-list choices)) + ;; Initialize ido before invoking ido-read-internal + (ido-common-initialization) (ido-read-internal 'list prompt hist def require-match initial-input))) (defun ido-unload-function () @@ -4770,5 +4773,4 @@ DEF, if non-nil, is the default value." (provide 'ido) -;; arch-tag: b63a3500-1735-41bd-8a01-05373f0864da ;;; ido.el ends here |