* lisp/descr-text.el (describe-char): Fix format args.

Fixes: debbugs:10129

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 49cba828b698468e3a81c70f9f3303d62e2aa5cd..2320a16a26e314f7c74ca2ffa06d4cc9f9ffa4ff 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-17  Juri Linkov  <juri@jurta.org>
+
+       * descr-text.el (describe-char): Fix format args.  (Bug#10129)
+
 2012-07-17  Fabián Ezequiel Gallina  <fgallina@cuca>
        Final renames and doc fixes for movement commands (bug#11899).
        * progmodes/python.el (python-nav-beginning-of-statement): Rename
@@ -4197,7 +4201,7 @@
 
 2012-04-16  Chong Yidong  <cyd@gnu.org>
 
-       * image.el (imagemagick--extension-regexp): New variable.
+       * image.el (imagemagick--file-regexp): New variable.
        (imagemagick-register-types): Use it.
        (imagemagick-types-inhibit): Add :set function.  Allow new value
        of t to inhibit all types.

diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index bcb95a54ad6da90c6a81f00e65ef9c9ae5c6a053..6be33066d5261892412784d8c01c403d95ce4cc9 100644 (file)
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -533,7 +533,7 @@ relevant to POS."
                        (col      (current-column)))
                   (if (or (/= beg 1)  (/= end (1+ total)))
                       (format "%d of %d (%d%%), restriction: <%d-%d>, column: %d%s"
-                              pos total percent col beg end hscroll)
+                              pos total percent beg end col hscroll)
                     (if (= pos end)
                         (format "%d of %d (EOB), column: %d%s" pos total col hscroll)
                       (format "%d of %d (%d%%), column: %d%s"