summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/edmacro.el3
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 @@
+2013-07-15 Glenn Morris <rgm@gnu.org>
+
+ * edmacro.el (edmacro-format-keys): Fix previous change.
+
2013-07-15 Paul Eggert <eggert@cs.ucla.edu>
* 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."
(unless (string-match " " desc)
(let ((times 1) (pos bind-len))
(while (not (cl-mismatch rest-mac rest-mac
- 0 bind-len pos (+ bind-len pos)))
+ :start1 0 :end1 bind-len
+ :start2 pos :end2 (+ bind-len pos)))
(cl-incf times)
(cl-incf pos bind-len))
(when (> times 1)