From: Masatake YAMATO <jet@gyve.org>
Date: Mon, 24 Oct 2005 16:56:53 +0000 (+0000)
Subject: (completion-common-substring): Use `completion-common-substring' prior to `completion... 
X-Git-Tag: emacs-pretest-22.0.90~6324
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc447cc519b9e51d0f5a86c7da84ce7bc7648bf8;p=emacs.git

(completion-common-substring): Use `completion-common-substring' prior to `completion-base-size'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0750137ceda..c8cdf66c645 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-25  Masatake YAMATO  <jet@gyve.org>
+
+	* simple.el (completion-common-substring): Use `completion-common-substring'
+	prior to `completion-base-size'.
+
 2005-10-24  Kenichi Handa  <handa@m17n.org>
 
 	* international/utf-7.el (utf-7): Add autoload cookie.
diff --git a/lisp/simple.el b/lisp/simple.el
index 8fbfaffaec6..9666f13af94 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4921,11 +4921,11 @@ is the substring.)")
 		      (funcall (get minibuffer-completion-table 'completion-base-size-function)))
 	      (setq completion-base-size 0))))
       ;; Put faces on first uncommon characters and common parts.
-      (when (or completion-base-size completion-common-substring)
+      (when (or completion-common-substring completion-base-size)
 	(let* ((common-string-length
-		(if completion-base-size
-		    (- (length mbuf-contents) completion-base-size)
-		  (length completion-common-substring)))
+		(if completion-common-substring
+		    (length completion-common-substring)
+		  (- (length mbuf-contents) completion-base-size)))
 	       (element-start (next-single-property-change
 			       (point-min)
 			       'mouse-face))