2001-09-08 Simon Josefsson <jas@extundo.com>

	From Daniel Pittman <daniel@rimspace.net>

	* gnus-spec.el (gnus-correct-pad-form): New function.
	(gnus-parse-simple-format): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ffca2d3..8f552b1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-08  Simon Josefsson  <jas@extundo.com>
+       From Daniel Pittman <daniel@rimspace.net>
+
+       * gnus-spec.el (gnus-correct-pad-form): New function.
+       (gnus-parse-simple-format): Use it.
+
 2001-09-07  Simon Josefsson  <jas@extundo.com>
 
        * gnus-group.el (gnus-group-sort-groups): Unmark all groups.

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index 340801c..91d6069 100644 (file)
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -372,6 +372,22 @@
        (if (equal val ,ignore-value)
           "" val))))
 
+(defun gnus-correct-pad-form (el pad-width)
+  "Return a form that pads EL to PAD-WIDTH accounting for multi-column
+characters correctly. This is because `format' may pad to columns or to
+characters when given a pad value."
+  (let ((pad (abs pad-width)))
+    (if (symbolp el)
+       `(let ((need (- ,pad (gnus-correct-length ,el))))
+          (if (> need 0)
+              (concat ,el (make-string need ?\ ))
+            ,el))
+      `(let* ((val (eval ,el))
+             (need (- ,pad (gnus-correct-length ,el))))
+        (if (> need 0)
+            (concat ,el (make-string need ?\ ))
+          ,el)))))
+
 (defun gnus-parse-format (format spec-alist &optional insert)
   ;; This function parses the FORMAT string with the help of the
   ;; SPEC-ALIST and returns a list that can be eval'ed to return the
@@ -536,10 +552,14 @@
            (setq elem '("*" ?s))))
          (setq elem-type (cadr elem))
          ;; Insert the new format elements.
-         (when pad-width
+         (when (and pad-width
+                    (not (and (featurep 'xemacs)
+                              gnus-use-correct-string-widths)))
            (insert (number-to-string pad-width)))
          ;; Create the form to be evaled.
-         (if (or max-width cut-width ignore-value)
+         (if (or max-width cut-width ignore-value
+                 (and (featurep 'xemacs)
+                      gnus-use-correct-string-widths))
              (progn
                (insert ?s)
                (let ((el (car elem)))
@@ -553,6 +573,8 @@
                    (setq el (gnus-tilde-cut-form el cut-width)))
                  (when max-width
                    (setq el (gnus-tilde-max-form el max-width)))
+                 (when pad-width
+                   (setq el (gnus-correct-pad-form el pad-width)))
                  (push el flist)))
            (insert elem-type)
            (push (car elem) flist))))