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

[Eli Zaretskii]

Index: emacs/lisp/emacs-lisp/lisp.el
diff -c emacs/lisp/emacs-lisp/lisp.el:1.69 emacs/lisp/emacs-lisp/lisp.el:1.70
*** emacs/lisp/emacs-lisp/lisp.el:1.69  Sun Oct 16 09:31:47 2005
--- emacs/lisp/emacs-lisp/lisp.el       Sat Dec 10 11:39:24 2005
***************
*** 569,578 ****
              ((null completion)
               (message "Can't find completion for \"%s\"" pattern)
               (ding))
-             ((not (string= pattern completion))
-              (delete-region beg end)
-              (insert completion))
              (t
               (message "Making completion list...")
               (let ((list (all-completions pattern obarray predicate)))
                 (setq list (sort list 'string<))
--- 569,579 ----
              ((null completion)
               (message "Can't find completion for \"%s\"" pattern)
               (ding))
              (t
+              (unless (string= completion pattern)
+                (delete-region beg end)
+                (insert completion)
+                (setq pattern completion))
               (message "Making completion list...")
               (let ((list (all-completions pattern obarray predicate)))
                 (setq list (sort list 'string<))
***************
*** 585,592 ****
                                         new))
                         (setq list (cdr list)))
                       (setq list (nreverse new))))
!                (with-output-to-temp-buffer "*Completions*"
!                  (display-completion-list list pattern)))
               (message "Making completion list...%s" "done")))))))
  
  ;;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e
--- 586,595 ----
                                         new))
                         (setq list (cdr list)))
                       (setq list (nreverse new))))
!                (if (> (length list) 1)
!                    (with-output-to-temp-buffer "*Completions*"
!                      (display-completion-list list pattern))
!                  (delete-windows-on "*Completions*")))
               (message "Making completion list...%s" "done")))))))
  
  ;;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e