summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/complete.el8
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