[Emacs-diffs] Changes to emacs/lisp/gnus/format-spec.el

[Richard M . Stallman]

Index: emacs/lisp/gnus/format-spec.el
diff -c emacs/lisp/gnus/format-spec.el:1.4 emacs/lisp/gnus/format-spec.el:1.5
*** emacs/lisp/gnus/format-spec.el:1.4  Sat Aug  6 19:51:41 2005
--- emacs/lisp/gnus/format-spec.el      Sun Oct  9 15:37:35 2005
***************
*** 33,39 ****
    "Return a string based on FORMAT and SPECIFICATION.
  FORMAT is a string containing `format'-like specs like \"bash %u %k\",
  while SPECIFICATION is an alist mapping from format spec characters
! to values."
    (with-temp-buffer
      (insert format)
      (goto-char (point-min))
--- 33,40 ----
    "Return a string based on FORMAT and SPECIFICATION.
  FORMAT is a string containing `format'-like specs like \"bash %u %k\",
  while SPECIFICATION is an alist mapping from format spec characters
! to values.  Any text properties on a %-spec itself are propagated to
! the text that it generates."
    (with-temp-buffer
      (insert format)
      (goto-char (point-min))
***************
*** 47,56 ****
        (let* ((num (match-string 1))
               (spec (string-to-char (match-string 2)))
               (val (cdr (assq spec specification))))
-         (delete-region (1- (match-beginning 0)) (match-end 0))
          (unless val
            (error "Invalid format character: %s" spec))
!         (insert (format (concat "%" num "s") val))))
         ;; Signal an error on bogus format strings.
         (t
        (error "Invalid format string"))))
--- 48,64 ----
        (let* ((num (match-string 1))
               (spec (string-to-char (match-string 2)))
               (val (cdr (assq spec specification))))
          (unless val
            (error "Invalid format character: %s" spec))
!         ;; Pad result to desired length.
!           (let ((text (format (concat "%" num "s") val)))
!           ;; Insert first, to preserve text properties.
!             (insert-and-inherit text)
!             ;; Delete the specifier body.
!             (delete-region (+ (match-beginning 0) (length text))
!                            (+ (match-end 0) (length text)))
!             ;; Delete the percent sign.
!             (delete-region (1- (match-beginning 0)) (match-beginning 0)))))
         ;; Signal an error on bogus format strings.
         (t
        (error "Invalid format string"))))