From: yamaoka <yamaoka>
Date: Mon, 14 Oct 2002 09:40:58 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_8-05-quimby~36
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ddf2edf823a39cd84eb0263b87b8f8c6a0c2c289;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5525533..06ee2ce 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-12  Jesper harder  <harder@ifa.au.dk>
+
+	* gnus-spec.el (gnus-pad-form): Use gnus-string-width-function.
+
 2002-10-11  Ted Zlatanov <tzz@lifelogs.com>
 
 	* spam.el (spam-check-ifile): added ifile as a spam checking
diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index 5468cb7..55af072 100644
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -408,21 +408,17 @@
 characters correctly. This is because `format' may pad to columns or to
 characters when given a pad value."
   (let ((pad (abs pad-width))
-	(side (< 0 pad-width)))
+	(side (< 0 pad-width))
+	(length-fun (gnus-string-width-function)))
     (if (symbolp el)
-	`(let ((need (- ,pad (,(if gnus-use-correct-string-widths
-				   'gnus-correct-length
-				 'length)
-			      ,el))))
+	`(let ((need (- ,pad (,length-fun ,el))))
 	   (if (> need 0)
 	       (concat ,(when side '(make-string need ?\ ))
 		       ,el
 		       ,(when (not side) '(make-string need ?\ )))
 	     ,el))
       `(let* ((val (eval ,el))
-	      (need (- ,pad (,(if gnus-use-correct-string-widths
-				  'gnus-correct-length
-				'length) val))))
+	      (need (- ,pad (,length-fun val))))
 	 (if (> need 0)
 	     (concat ,(when side '(make-string need ?\ ))
 		     val