Merge from emacs--devo--0

[gnu-emacs] / lisp / gnus / format-spec.el

diff --git a/lisp/gnus/format-spec.el b/lisp/gnus/format-spec.el
index d287af6f780020048c4e1213a3294458bcae011a..a01b3d0e052542931d50cec7bfce1c7b575617c4 100644 (file)
--- a/lisp/gnus/format-spec.el
+++ b/lisp/gnus/format-spec.el
@@ -1,5 +1,7 @@
 ;;; format-spec.el --- functions for formatting arbitrary formatting strings
-;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: tools
@@ -31,7 +33,8 @@
   "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."
+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))
@@ -45,10 +48,17 @@ to values."
        (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))))
+         ;; 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"))))