diff options
Diffstat (limited to 'lisp/ido.el')
| -rw-r--r-- | lisp/ido.el | 57 |
1 files changed, 28 insertions, 29 deletions
diff --git a/lisp/ido.el b/lisp/ido.el index 70245800121..4ab183b3207 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -279,7 +279,7 @@ ;; can be used by other packages to read a buffer name, a file name, ;; or a directory name in the `ido' way. -;;; Acknowledgements +;;; Acknowledgments ;; Infinite amounts of gratitude goes to Stephen Eglen <stephen@cns.ed.ac.uk> ;; who wrote iswitch-buffer mode - from which I ripped off 99% of the code @@ -714,7 +714,7 @@ See also `ido-dir-file-cache' and `ido-save-directory-list-file'." :type 'integer :group 'ido) -(defcustom ido-max-directory-size 30000 +(defcustom ido-max-directory-size nil "Maximum size (in bytes) for directories to use ido completion. If you enter a directory with a size larger than this size, ido will not provide the normal completion. To show the completions, use C-a." @@ -803,44 +803,39 @@ subdirs in the alternatives." :type 'boolean :group 'ido) -(defface ido-first-match '((t (:bold t))) +(defface ido-first-match '((t :weight bold)) "Face used by ido for highlighting first match." :group 'ido) (defface ido-only-match '((((class color)) - (:foreground "ForestGreen")) - (t (:italic t))) + :foreground "ForestGreen") + (t :slant italic)) "Face used by ido for highlighting only match." :group 'ido) (defface ido-subdir '((((min-colors 88) (class color)) - (:foreground "red1")) - (((class color)) - (:foreground "red")) - (t (:underline t))) + :foreground "red1") + (((class color)) + :foreground "red") + (t :underline t)) "Face used by ido for highlighting subdirs in the alternatives." :group 'ido) -(defface ido-virtual '((t (:inherit font-lock-builtin-face))) +(defface ido-virtual '((t :inherit font-lock-builtin-face)) "Face used by ido for matching virtual buffer names." :version "24.1" :group 'ido) -(defface ido-indicator '((((min-colors 88) (class color)) - (:foreground "yellow1" - :background "red1" - :width condensed)) - (((class color)) - (:foreground "yellow" - :background "red" - :width condensed)) - (t (:inverse-video t))) +(defface ido-indicator '((((min-colors 88) (class color)) + :foreground "yellow1" :background "red1" :width condensed) + (((class color)) + :foreground "yellow" :background "red" :width condensed) + (t :inverse-video t)) "Face used by ido for highlighting its indicators." :group 'ido) (defface ido-incomplete-regexp - '((t - (:inherit font-lock-warning-face))) + '((t :inherit font-lock-warning-face)) "Ido face for indicating incomplete regexps." :group 'ido) @@ -884,7 +879,7 @@ The following variables are available, but should not be changed: :group 'ido) (defvar ido-rewrite-file-prompt-rules nil - "*Alist of rewriting rules for directory names in ido prompts. + "Alist of rewriting rules for directory names in ido prompts. A list of elements of the form (FROM . TO) or (FROM . FUNC), each meaning to rewrite the directory name if matched by FROM by either substituting the matched string by TO or calling the function FUNC @@ -905,9 +900,14 @@ Otherwise, only the current list of matches is shown." :type 'boolean :group 'ido) -(defvar ido-all-frames 'visible - "*Argument to pass to `walk-windows' when finding visible files. -See documentation of `walk-windows' for useful values.") +(defcustom ido-all-frames 'visible + "Argument to pass to `walk-windows' when Ido is finding buffers. +See documentation of `walk-windows' for useful values." + :type '(choice (const :tag "Selected frame only" nil) + (const :tag "All existing frames" t) + (const :tag "All visible frames" visible) + (const :tag "All frames on this terminal" 0)) + :group 'ido) (defcustom ido-minibuffer-setup-hook nil "Ido-specific customization of minibuffer setup. @@ -4065,8 +4065,7 @@ 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. -\\[ido-select-text] Select the current prompt as the buffer. -If no buffer is found, prompt for a new one. +\\[ido-select-text] Use the current input string verbatim. \\[ido-next-match] Put the first element at the end of the list. \\[ido-prev-match] Put the last element at the start of the list. @@ -4152,8 +4151,7 @@ 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. -\\[ido-select-text] Select the current prompt as the buffer or file. -If no buffer or file is found, prompt for a new one. +\\[ido-select-text] Use the current input string verbatim. \\[ido-next-match] Put the first element at the end of the list. \\[ido-prev-match] Put the last element at the start of the list. @@ -4161,6 +4159,7 @@ If no buffer or file is found, prompt for a new one. matches all files. If there is only one match, select that file. If there is no common suffix, show a list of all matching files in a separate window. +\\[ido-magic-delete-char] Open the specified directory in Dired mode. \\[ido-edit-input] Edit input string (including directory). \\[ido-prev-work-directory] or \\[ido-next-work-directory] go to previous/next directory in work directory history. \\[ido-merge-work-directories] search for file in the work directory history. |