Change the call signature to keymap-substitute

* lisp/keymap.el (keymap-substitute): Make the keymap the first
parameter for symmetry with the other functions.
* lisp/emacs-lisp/shortdoc.el (keymaps):
* lisp/emacs-lisp/bytecomp.el (lambda): Adjust.

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 4078a7314f3e2193b9a07f144c122997bbc1dae3..3338c3831713a6423e3cc5f5bf3a8428d6d1dc2c 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -5066,7 +5066,7 @@ binding slots have been popped."
    (keymap-unset 2)
    (keymap-global-unset 1)
    (keymap-local-unset 1)
-   (keymap-substitute 1 2)
+   (keymap-substitute 2 3)
    (keymap-set-after 2)
    (key-translate 1 2)
    (keymap-lookup 2)

diff --git a/lisp/emacs-lisp/shortdoc.el b/lisp/emacs-lisp/shortdoc.el
index 228d1e055139efcafe567c5ed8c469f299d0ca1a..157209fcf74a3ad758ce5e4cf3d898e38be46a0f 100644 (file)
--- a/lisp/emacs-lisp/shortdoc.el
+++ b/lisp/emacs-lisp/shortdoc.el
@@ -1242,7 +1242,7 @@ There can be any number of :example/:result elements."
   (keymap-global-unset
    :no-eval (keymap-global-unset "C-c C-c"))
   (keymap-substitute
-   :no-eval (keymap-substitute "C-c C-c" "M-a" map))
+   :no-eval (keymap-substitute map "C-c C-c" "M-a"))
   (keymap-set-after
    :no-eval (keymap-set-after map "<separator-2>" menu-bar-separator))
   "Predicates"

diff --git a/lisp/keymap.el b/lisp/keymap.el
index b634487ba61c2300563b1d73060c294f79d33b1a..a9331e160498eaf642c581eecd5f633d2ee49228 100644 (file)
--- a/lisp/keymap.el
+++ b/lisp/keymap.el
@@ -121,7 +121,7 @@ parent keymap to be used."
   (keymap--check key)
   (define-key keymap (key-parse key) nil remove))
 
-(defun keymap-substitute (olddef newdef keymap &optional oldmap prefix)
+(defun keymap-substitute (keymap olddef newdef &optional oldmap prefix)
   "Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF.
 In other words, OLDDEF is replaced with NEWDEF wherever it appears.
 Alternatively, if optional fourth argument OLDMAP is specified, we redefine