X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fformat-spec.el;h=a5de3496f81cd759517c84cdca55844da58cc98e;hb=4bc48529523159c55dcd62d5a6be60521540b371;hp=0ef59cc629cd88c04091d4b500726ef320832f05;hpb=fe70196e10cdd849981dbd014882fb20237d0740;p=gnus

diff --git a/lisp/format-spec.el b/lisp/format-spec.el
index 0ef59cc62..a5de3496f 100644
--- a/lisp/format-spec.el
+++ b/lisp/format-spec.el
@@ -1,17 +1,16 @@
 ;;; format-spec.el --- functions for formatting arbitrary formatting strings
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: tools
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -47,14 +44,15 @@ the text that it generates."
        ((looking-at "\\([-0-9.]*\\)\\([a-zA-Z]\\)")
 	(let* ((num (match-string 1))
 	       (spec (string-to-char (match-string 2)))
-	       (val (cdr (assq spec specification))))
+	       (val (assq spec specification)))
 	  (unless val
 	    (error "Invalid format character: `%%%c'" spec))
+	  (setq val (cdr val))
 	  ;; Pad result to desired length.
-          (let ((text (format (concat "%" num "s") val)))
+	  (let ((text (format (concat "%" num "s") val)))
 	    ;; Insert first, to preserve text properties.
-            (insert-and-inherit text)
-            ;; Delete the specifier body.
+	    (insert-and-inherit text)
+	    ;; Delete the specifier body.
             (delete-region (+ (match-beginning 0) (length text))
                            (+ (match-end 0) (length text)))
             ;; Delete the percent sign.
@@ -78,5 +76,4 @@ starting with a character."
 
 (provide 'format-spec)
 
-;;; arch-tag: c22d49cf-d167-445d-b7f1-2504d4173f53
 ;;; format-spec.el ends here