Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 167c126..4bb603b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-18  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-spec.el (gnus-correct-pad-form): Remove until papers are
+       signed.
+       (gnus-parse-simple-format): Don't use it.
+
 2001-09-17  Miles Bader  <miles@gnu.org>
 
        * gnus-srvr.el (gnus-server-insert-server-line): Don't let an

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index f11775e..c7f9463 100644 (file)
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -377,27 +377,6 @@
        (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))
-       (side (< 0 pad-width)))
-    (if (symbolp el)
-       `(let ((need (- ,pad (gnus-correct-length ,el))))
-          (if (> need 0)
-              (concat ,(when side '(make-string need ?\ ))
-                      ,el
-                      ,(when (not side) '(make-string need ?\ )))
-            ,el))
-      `(let* ((val (eval ,el))
-             (need (- ,pad (gnus-correct-length ,el))))
-        (if (> need 0)
-            (concat ,(when side '(make-string need ?\ ))
-                    ,el
-                    ,(when (not side) '(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
@@ -563,14 +542,10 @@ characters when given a pad value."
            (setq elem '("*" ?s))))
          (setq elem-type (cadr elem))
          ;; Insert the new format elements.
-         (when (and pad-width
-                    (not (and (featurep 'xemacs)
-                              gnus-use-correct-string-widths)))
+         (when pad-width
            (insert (number-to-string pad-width)))
          ;; Create the form to be evaled.
-         (if (or max-width cut-width ignore-value
-                 (and (featurep 'xemacs)
-                      gnus-use-correct-string-widths))
+         (if (or max-width cut-width ignore-value)
              (progn
                (insert ?s)
                (let ((el (car elem)))
@@ -584,8 +559,6 @@ characters when given a pad value."
                    (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))))