Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5525533..06ee2ce 100644 (file)
--- 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 (file)
--- 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