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

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     08/03/21 23:58:06

Index: comint.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/comint.el,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -b -r1.376 -r1.377
--- comint.el   21 Mar 2008 23:51:40 -0000      1.376
+++ comint.el   21 Mar 2008 23:58:06 -0000      1.377
@@ -2972,7 +2972,7 @@
                   ((or comint-completion-autolist
                        (string-equal stub completion))
                    ;; It's not unique, list possible completions.
-                   (comint-dynamic-list-completions completions)
+                   (comint-dynamic-list-completions completions stub)
                    'listed)
                   (t
                    (unless minibuffer-p
@@ -2998,7 +2998,8 @@
            (minibuffer-message (format " [No completions of %s]" filename))
          (message "No completions of %s" filename))
       (comint-dynamic-list-completions
-       (mapcar 'comint-quote-filename completions)))))
+       (mapcar 'comint-quote-filename completions)
+       filenondir))))
 
 
 ;; This is bound locally in a *Completions* buffer to the list of
@@ -3008,8 +3009,9 @@
 
 (defvar comint-dynamic-list-completions-config nil)
 
-(defun comint-dynamic-list-completions (completions)
+(defun comint-dynamic-list-completions (completions &optional common-substring)
   "List in help buffer sorted COMPLETIONS.
+The meaning of COMMON-SUBSTRING is the same as in `display-completion-list'.
 Typing SPC flushes the help buffer."
   (let ((window (get-buffer-window "*Completions*" 0)))
     (setq completions (sort completions 'string-lessp))
@@ -3041,7 +3043,7 @@
       (setq comint-dynamic-list-completions-config
            (current-window-configuration))
       (with-output-to-temp-buffer "*Completions*"
-       (display-completion-list completions))
+       (display-completion-list completions common-substring))
       (if (window-minibuffer-p (selected-window))
          (minibuffer-message " [Type space to flush; repeat completion command 
to scroll]")
        (message "Type space to flush; repeat completion command to scroll")))