Commit 33c0f65b authored by Glenn Morris's avatar Glenn Morris
Browse files

* lisp/format-spec.el (format-spec): Allow spec chars with nil values.

Fixes: debbugs:14420
parent d6635ba2
2013-05-20 Glenn Morris <rgm@gnu.org>
* format-spec.el (format-spec): Allow spec chars with nil. (Bug#14420)
2013-05-19 Dmitry Gutov <dgutov@yandex.ru>
 
* progmodes/ruby-mode.el (ruby-expression-expansion-re): Allow to
......
......@@ -44,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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment