Mercurial > emacs
changeset 97744:b5ba9469961a
(comint-dynamic-complete-as-filename): If case is ignored while
matching, replace the entire filename with completion.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 26 Aug 2008 23:49:01 +0000 |
| parents | 58b334ba1ec6 |
| children | 30375d5db747 |
| files | lisp/comint.el |
| diffstat | 1 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/comint.el Tue Aug 26 23:46:39 2008 +0000 +++ b/lisp/comint.el Tue Aug 26 23:49:01 2008 +0000 @@ -2821,7 +2821,10 @@ " ") (t (cdr comint-completion-addsuffix)))) - (filename (or (comint-match-partial-filename) "")) + (filename (comint-match-partial-filename)) + (filename-beg (if filename (match-beginning 0))) + (filename-end (if filename (match-end 0))) + (filename (or filename "")) (filedir (file-name-directory filename)) (filenondir (file-name-nondirectory filename)) (directory (if filedir (comint-directory filedir) default-directory)) @@ -2839,9 +2842,19 @@ (comint-dynamic-list-filename-completions)) (t ; Completion string returned. (let ((file (concat (file-name-as-directory directory) completion))) + (if (or (null read-file-name-completion-ignore-case) + (null filename-beg) + (null filename-end)) + (insert (comint-quote-filename + (substring (directory-file-name completion) + (length filenondir))))) + ;; If read-file-name-completion-ignore-case is non-nil, + ;; the completion string may have a different case than + ;; what's in the prompt. + (delete-region filename-beg filename-end) + (if filedir (insert filedir)) (insert (comint-quote-filename - (substring (directory-file-name completion) - (length filenondir)))) + (directory-file-name completion))) (cond ((symbolp (file-name-completion completion directory)) ;; We inserted a unique completion. (insert (if (file-directory-p file) dirsuffix filesuffix))