[Emacs-diffs] emacs/lisp ChangeLog minibuffer.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/24 02:37:40

Modified files:
        lisp           : ChangeLog minibuffer.el 

Log message:
        (minibuffer-force-complete): Cycle the list, rather
        than just dropping elements from it (bug#4504).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16246&r2=1.16247
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/minibuffer.el?cvsroot=emacs&r1=1.83&r2=1.84

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16246
retrieving revision 1.16247
diff -u -b -r1.16246 -r1.16247
--- ChangeLog   24 Sep 2009 02:15:11 -0000      1.16246
+++ ChangeLog   24 Sep 2009 02:37:37 -0000      1.16247
@@ -1,5 +1,8 @@
 2009-09-24  Stefan Monnier  <address@hidden>
 
+       * 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 <address@hidden>.

Index: minibuffer.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/minibuffer.el,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- minibuffer.el       2 Sep 2009 03:09:19 -0000       1.83
+++ minibuffer.el       24 Sep 2009 02:37:40 -0000      1.84
@@ -546,7 +546,9 @@
       ;; 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)