# HG changeset patch
# User Masatake YAMATO <jet@gyve.org>
# Date 1130173013 0
# Node ID 436739baf9f105b7b3bb27d4bb0caaa0ca103dfd
# Parent  48fff88992ce28c4259afcd115b14c62d8cf64d8
(completion-common-substring): Use `completion-common-substring' prior to `completion-base-size'.

diff -r 48fff88992ce -r 436739baf9f1 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Oct 24 16:47:53 2005 +0000
+++ b/lisp/ChangeLog	Mon Oct 24 16:56:53 2005 +0000
@@ -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 -r 48fff88992ce -r 436739baf9f1 lisp/simple.el
--- a/lisp/simple.el	Mon Oct 24 16:47:53 2005 +0000
+++ b/lisp/simple.el	Mon Oct 24 16:56:53 2005 +0000
@@ -4921,11 +4921,11 @@
 		      (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))