[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ido.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ido.el [lexbind] |
Date: |
Wed, 15 Sep 2004 20:39:18 -0400 |
Index: emacs/lisp/ido.el
diff -c emacs/lisp/ido.el:1.31.2.7 emacs/lisp/ido.el:1.31.2.8
*** emacs/lisp/ido.el:1.31.2.7 Sat Sep 4 09:26:22 2004
--- emacs/lisp/ido.el Thu Sep 16 00:14:58 2004
***************
*** 482,495 ****
:group 'ido)
(defcustom ido-enable-prefix nil
! "*Nil means that `ido' will match if the inserted text is an
! arbitrary substring (default). If non-nil `ido' will only match if the
inserted
! text is a prefix \(this behavior is like the standard unix- or
! emacs-completion works).
Value can be toggled within `ido' using `ido-toggle-prefix'."
:type 'boolean
:group 'ido)
(defcustom ido-confirm-unique-completion nil
"*Non-nil means that even a unique completion must be confirmed.
This means that \\[ido-complete] must always be followed by
\\[ido-exit-minibuffer]
--- 482,501 ----
:group 'ido)
(defcustom ido-enable-prefix nil
! "*Non-nil means only match if the entered text is a prefix of file name.
! This behavior is like the standard emacs-completion.
! Nil means to match if the entered text is an arbitrary substring.
Value can be toggled within `ido' using `ido-toggle-prefix'."
:type 'boolean
:group 'ido)
+ (defcustom ido-enable-dot-prefix nil
+ "*Non-nil means to match leading dot as prefix.
+ I.e. hidden files and buffers will match only if you type a dot
+ as first char even if `ido-enable-prefix' is nil."
+ :type 'boolean
+ :group 'ido)
+
(defcustom ido-confirm-unique-completion nil
"*Non-nil means that even a unique completion must be confirmed.
This means that \\[ido-complete] must always be followed by
\\[ido-exit-minibuffer]
***************
*** 2928,2940 ****
(concat "\\`" re "\\'")))
(prefix-re (and full-re (not ido-enable-prefix)
(concat "\\`" rexq)))
full-matches
prefix-matches
matches)
(mapcar
(lambda (item)
(let ((name (ido-name item)))
! (if (string-match re name)
(cond
((and full-re (string-match full-re name))
(setq full-matches (cons item full-matches)))
--- 2934,2955 ----
(concat "\\`" re "\\'")))
(prefix-re (and full-re (not ido-enable-prefix)
(concat "\\`" rexq)))
+ (non-prefix-dot (or (not ido-enable-dot-prefix)
+ (not ido-process-ignore-lists)
+ ido-enable-prefix
+ (= (length ido-text) 0)))
+
full-matches
prefix-matches
matches)
(mapcar
(lambda (item)
(let ((name (ido-name item)))
! (if (and (or non-prefix-dot
! (if (= (aref ido-text 0) ?.)
! (= (aref name 0) ?.)
! (/= (aref name 0) ?.)))
! (string-match re name))
(cond
((and full-re (string-match full-re name))
(setq full-matches (cons item full-matches)))