Address compilation warnings due to 2016-01-03 mml refactoring.

[gnu-emacs] / lisp / edmacro.el

diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 67992d16527126667f95692c39e00a3abf6e3447..a1750d42d38319c29825c0783b294a29405a9bb6 100644 (file)
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -1,6 +1,6 @@
 ;;; edmacro.el --- keyboard macro editor
 
-;; Copyright (C) 1993-1994, 2001-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Maintainer: Dave Gillespie <daveg@synaptics.com>
@@ -89,7 +89,7 @@ Default nil means to write characters above \\177 in octal notation."
   "Edit a keyboard macro.
 At the prompt, type any key sequence which is bound to a keyboard macro.
 Or, type `C-x e' or RET to edit the last keyboard macro, `C-h l' to edit
-the last 300 keystrokes as a keyboard macro, or `M-x' to edit a macro by
+the last 300 keystrokes as a keyboard macro, or `\\[execute-extended-command]' to edit a macro by
 its command name.
 With a prefix argument, format the macro in a more concise way."
   (interactive "kKeyboard macro to edit (C-x e, M-x, C-h l, or keys): \nP")
@@ -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)