Mercurial > emacs
comparison lisp/complete.el @ 82855:f839eef40802
(PC-do-completion): Make RET accept a non-unique but complete
expansion again.
| author | Michaël Cadilhac <michael.cadilhac@lrde.org> |
|---|---|
| date | Sun, 26 Aug 2007 19:20:10 +0000 |
| parents | c0e2cbf10e3a |
| children | 36f09a4f9133 b83d0dadb2a7 |
comparison
equal
deleted
inserted
replaced
| 82854:928ee397e253 | 82855:f839eef40802 |
|---|---|
| 829 ;; Note that choose-completion-string-functions | 829 ;; Note that choose-completion-string-functions |
| 830 ;; plays around with point. | 830 ;; plays around with point. |
| 831 (setq completion-base-size (if dirname | 831 (setq completion-base-size (if dirname |
| 832 dirlength | 832 dirlength |
| 833 (- beg prompt-end)))))) | 833 (- beg prompt-end)))))) |
| 834 (PC-temp-minibuffer-message " [Next char not unique]")))))) | 834 (PC-temp-minibuffer-message " [Next char not unique]")) |
| 835 ;; Expansion of filenames is not reversible, so just keep | 835 ;; Expansion of filenames is not reversible, |
| 836 ;; the prefix. | 836 ;; so just keep the prefix. |
| 837 (when (and abbreviated filename) | 837 (when (and abbreviated filename) |
| 838 (delete-region (point) end)) | 838 (delete-region (point) end)) |
| 839 nil) | 839 nil))))) |
| 840 | 840 |
| 841 ;; Only one possible completion | 841 ;; Only one possible completion |
| 842 (t | 842 (t |
| 843 (if (and (equal basestr (car poss)) | 843 (if (and (equal basestr (car poss)) |
| 844 (not (and env-on filename)) | 844 (not (and env-on filename)) |