[Emacs-diffs] /srv/bzr/emacs/trunk r112644: * lisp/format-spec.el (format-spec): Allow spec chars with nil values.

[Glenn Morris]

------------------------------------------------------------
revno: 112644
fixes bug: http://debbugs.gnu.org/14420
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2013-05-20 00:45:58 -0700
message:
  * lisp/format-spec.el (format-spec): Allow spec chars with nil values.
modified:
  lisp/ChangeLog
  lisp/format-spec.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-19 06:52:22 +0000
+++ b/lisp/ChangeLog    2013-05-20 07:45:58 +0000
@@ -1,3 +1,7 @@
+2013-05-20  Glenn Morris  <address@hidden>
+
+       * format-spec.el (format-spec): Allow spec chars with nil.  (Bug#14420)
+
 2013-05-19  Dmitry Gutov  <address@hidden>
 
        * progmodes/ruby-mode.el (ruby-expression-expansion-re): Allow to

=== modified file 'lisp/format-spec.el'
--- a/lisp/format-spec.el       2013-01-01 09:11:05 +0000
+++ b/lisp/format-spec.el       2013-05-20 07:45:58 +0000
@@ -44,14 +44,15 @@
        ((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.