[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/lisp.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/08/14 23:44:14

Index: lisp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/lisp.el,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- lisp.el     11 Aug 2008 21:38:17 -0000      1.87
+++ lisp.el     14 Aug 2008 23:44:14 -0000      1.88
@@ -687,18 +687,19 @@
                   (message "Making completion list..."))
                 (let ((list (all-completions pattern obarray predicate)))
                   (setq list (sort list 'string<))
-                  (or (eq predicate 'fboundp)
+                  (unless (eq predicate 'fboundp)
                       (let (new)
-                        (while list
-                          (setq new (cons (if (fboundp (intern (car list)))
-                                              (list (car list) " <f>")
-                                            (car list))
+                      (dolist (compl list)
+                        (push (if (fboundp (intern compl))
+                                  (list compl " <f>")
+                                compl)
                                           new))
-                          (setq list (cdr list)))
                         (setq list (nreverse new))))
                   (if (> (length list) 1)
                       (with-output-to-temp-buffer "*Completions*"
-                        (display-completion-list list pattern))
+                        (display-completion-list
+                         list pattern
+                         (- beg (field-beginning))))
                     ;; Don't leave around a completions buffer that's
                     ;; out of date.
                     (let ((win (get-buffer-window "*Completions*" 0)))