diff options
| author | Michaël Cadilhac <michael.cadilhac@lrde.org> | 2007-08-26 19:20:20 +0000 |
|---|---|---|
| committer | Michaël Cadilhac <michael.cadilhac@lrde.org> | 2007-08-26 19:20:20 +0000 |
| commit | f8a3deedc67daa49179133d682718fe2e7f09c9a (patch) | |
| tree | da316b25b2337c05d4aff99032fb79c46e46b2ef /lisp | |
| parent | 3300097f4d362f7fe413b06b73b602ee00ad9c65 (diff) | |
| download | emacs-f8a3deedc67daa49179133d682718fe2e7f09c9a.tar.gz | |
(PC-do-completion): Make RET accept a non-unique but complete
expansion again.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/complete.el | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d6eba286392..fbdd5cd6ca5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-08-26 Sean O'Rourke <seano@cs.ucsd.edu> + + * complete.el (PC-do-completion): Make RET accept a non-unique but + complete expansion again. + 2007-08-26 Thien-Thi Nguyen <ttn@gnuvola.org> * eshell/esh-opt.el (eshell-eval-using-options): diff --git a/lisp/complete.el b/lisp/complete.el index 75774b65db0..01db126c5f8 100644 --- a/lisp/complete.el +++ b/lisp/complete.el @@ -831,12 +831,12 @@ GOTO-END is non-nil, however, it instead replaces up to END." (setq completion-base-size (if dirname dirlength (- beg prompt-end)))))) - (PC-temp-minibuffer-message " [Next char not unique]")))))) - ;; Expansion of filenames is not reversible, so just keep - ;; the prefix. + (PC-temp-minibuffer-message " [Next char not unique]")) + ;; Expansion of filenames is not reversible, + ;; so just keep the prefix. (when (and abbreviated filename) (delete-region (point) end)) - nil) + nil))))) ;; Only one possible completion (t |