(minibuffer-force-complete): Cycle the list, rather

than just dropping elements from it (bug#4504).

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e216b9e1c7f..d41c8f2d0ac 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-09-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * minibuffer.el (minibuffer-force-complete): Cycle the list, rather
+        than just dropping elements from it (bug#4504).
+
         * term.el (term-set-scroll-region): Don't move cursor any more.
         (term-handle-ansi-escape): Call term-goto here instead.
         Suggested by Ivan Kanis <apple@kanis.eu>.
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 90490973f80..8f2de068444 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -546,7 +546,9 @@ Repeated uses step through the possible completions."
       ;; completion-all-sorted-completions to nil, but we prefer not to,
       ;; so that repeated calls minibuffer-force-complete still cycle
       ;; through the previous possible completions.
-      (setq completion-all-sorted-completions (cdr all)))))
+      (let ((last (last all)))
+        (setcdr last (cons (car all) (cdr last)))
+        (setq completion-all-sorted-completions (cdr all))))))
 
 (defvar minibuffer-confirm-exit-commands
   '(minibuffer-complete minibuffer-complete-word PC-complete PC-complete-word)