Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-482
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-483
   Build-in-place tweak

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-484
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-228

1 files changed, 7 insertions, 1 deletions

diff --git a/lisp/simple.el b/lisp/simple.el
index 9a7b7f245d0..95f6ed864cf 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4308,6 +4308,12 @@ make the common parts less visible than normal, so that the rest
 of the differing parts is, by contrast, slightly highlighted."
   :group 'completion)
 
+;; This is for packages that need to bind it to a non-default regexp
+;; in order to make the first-differing character highlight work
+;; to their liking
+(defvar completion-root-regexp "^/"
+  "Regexp to use in `completion-setup-function' to find the root directory.")
+
 (defun completion-setup-function ()
   (let ((mainbuf (current-buffer))
         (mbuf-contents (minibuffer-contents)))
@@ -4336,7 +4342,7 @@ of the differing parts is, by contrast, slightly highlighted."
                 (with-current-buffer mainbuf
                   (save-excursion
                     (goto-char (point-max))
-                    (skip-chars-backward "^/")
+                    (skip-chars-backward completion-root-regexp)
                     (- (point) (minibuffer-prompt-end)))))
         ;; Otherwise, in minibuffer, the whole input is being completed.
         (if (minibufferp mainbuf)