diff options
| author | Juri Linkov | 2012-07-17 21:15:02 +0300 |
|---|---|---|
| committer | Juri Linkov | 2012-07-17 21:15:02 +0300 |
| commit | b19dd9d1bbf0afce896a367a817e0e22c381308b (patch) | |
| tree | 906318056f35ff57050cd6e2397f9a99350d5b3a | |
| parent | bcdc27d7d4a5914ddbbec86441064bbe8f231a52 (diff) | |
| download | emacs-b19dd9d1bbf0afce896a367a817e0e22c381308b.tar.gz emacs-b19dd9d1bbf0afce896a367a817e0e22c381308b.zip | |
* lisp/descr-text.el (describe-char): Fix format args.
Fixes: debbugs:10129
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/descr-text.el | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 49cba828b69..2320a16a26e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-07-17 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * descr-text.el (describe-char): Fix format args. (Bug#10129) | ||
| 4 | |||
| 1 | 2012-07-17 Fabián Ezequiel Gallina <fgallina@cuca> | 5 | 2012-07-17 Fabián Ezequiel Gallina <fgallina@cuca> |
| 2 | Final renames and doc fixes for movement commands (bug#11899). | 6 | Final renames and doc fixes for movement commands (bug#11899). |
| 3 | * progmodes/python.el (python-nav-beginning-of-statement): Rename | 7 | * progmodes/python.el (python-nav-beginning-of-statement): Rename |
| @@ -4197,7 +4201,7 @@ | |||
| 4197 | 4201 | ||
| 4198 | 2012-04-16 Chong Yidong <cyd@gnu.org> | 4202 | 2012-04-16 Chong Yidong <cyd@gnu.org> |
| 4199 | 4203 | ||
| 4200 | * image.el (imagemagick--extension-regexp): New variable. | 4204 | * image.el (imagemagick--file-regexp): New variable. |
| 4201 | (imagemagick-register-types): Use it. | 4205 | (imagemagick-register-types): Use it. |
| 4202 | (imagemagick-types-inhibit): Add :set function. Allow new value | 4206 | (imagemagick-types-inhibit): Add :set function. Allow new value |
| 4203 | of t to inhibit all types. | 4207 | of t to inhibit all types. |
diff --git a/lisp/descr-text.el b/lisp/descr-text.el index bcb95a54ad6..6be33066d52 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el | |||
| @@ -533,7 +533,7 @@ relevant to POS." | |||
| 533 | (col (current-column))) | 533 | (col (current-column))) |
| 534 | (if (or (/= beg 1) (/= end (1+ total))) | 534 | (if (or (/= beg 1) (/= end (1+ total))) |
| 535 | (format "%d of %d (%d%%), restriction: <%d-%d>, column: %d%s" | 535 | (format "%d of %d (%d%%), restriction: <%d-%d>, column: %d%s" |
| 536 | pos total percent col beg end hscroll) | 536 | pos total percent beg end col hscroll) |
| 537 | (if (= pos end) | 537 | (if (= pos end) |
| 538 | (format "%d of %d (EOB), column: %d%s" pos total col hscroll) | 538 | (format "%d of %d (EOB), column: %d%s" pos total col hscroll) |
| 539 | (format "%d of %d (%d%%), column: %d%s" | 539 | (format "%d of %d (%d%%), column: %d%s" |