format-spec.el: Work for XEmacs

(format-spec, format-spec-make): Normalize characters into numbers in spec keys.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b6ba51..3bb6464 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * format-spec.el (format-spec, format-spec-make): Work for XEmacs.
+       Normalize characters into numbers in spec keys.
+
 2015-05-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * dgnushack.el (declare-function): Redefine it to use autoload.

diff --git a/lisp/format-spec.el b/lisp/format-spec.el
index e61978e..a275393 100644 (file)
--- a/lisp/format-spec.el
+++ b/lisp/format-spec.el
@@ -43,7 +43,7 @@ the text that it generates."
        ;; Valid format spec.
        ((looking-at "\\([-0-9.]*\\)\\([a-zA-Z]\\)")
        (let* ((num (match-string 1))
-              (spec (string-to-char (match-string 2)))
+              (spec (+ (string-to-char (match-string 2)) 0))
               (val (assq spec specification)))
          (unless val
            (error "Invalid format character: `%%%c'" spec))
@@ -70,7 +70,7 @@ starting with a character."
     (while pairs
       (unless (cdr pairs)
        (error "Invalid list of pairs"))
-      (push (cons (car pairs) (cadr pairs)) alist)
+      (push (cons (+ (car pairs) 0) (cadr pairs)) alist)
       (setq pairs (cddr pairs)))
     (nreverse alist)))