diff options
| author | Glenn Morris | 2013-07-15 15:45:22 -0400 |
|---|---|---|
| committer | Glenn Morris | 2013-07-15 15:45:22 -0400 |
| commit | da48522e656667d815a591435b59aced91326035 (patch) | |
| tree | fb077c2794f07697ac872d1f46f05194c5903b3d /lisp | |
| parent | bafe80ce49206c61bea74b0c70080bfdc97785d1 (diff) | |
| download | emacs-da48522e656667d815a591435b59aced91326035.tar.gz emacs-da48522e656667d815a591435b59aced91326035.zip | |
* lisp/edmacro.el (edmacro-format-keys): Fix previous change.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/edmacro.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d11db5d303e..5949dcdbd00 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-07-15 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * edmacro.el (edmacro-format-keys): Fix previous change. | ||
| 4 | |||
| 1 | 2013-07-15 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2013-07-15 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | * shell.el (explicit-bash-args): Remove obsolete hack for Bash 1.x. | 7 | * shell.el (explicit-bash-args): Remove obsolete hack for Bash 1.x. |
diff --git a/lisp/edmacro.el b/lisp/edmacro.el index 67992d16527..73662951188 100644 --- a/lisp/edmacro.el +++ b/lisp/edmacro.el | |||
| @@ -562,7 +562,8 @@ doubt, use whitespace." | |||
| 562 | (unless (string-match " " desc) | 562 | (unless (string-match " " desc) |
| 563 | (let ((times 1) (pos bind-len)) | 563 | (let ((times 1) (pos bind-len)) |
| 564 | (while (not (cl-mismatch rest-mac rest-mac | 564 | (while (not (cl-mismatch rest-mac rest-mac |
| 565 | 0 bind-len pos (+ bind-len pos))) | 565 | :start1 0 :end1 bind-len |
| 566 | :start2 pos :end2 (+ bind-len pos))) | ||
| 566 | (cl-incf times) | 567 | (cl-incf times) |
| 567 | (cl-incf pos bind-len)) | 568 | (cl-incf pos bind-len)) |
| 568 | (when (> times 1) | 569 | (when (> times 1) |