From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Wed, 17 Nov 2021 07:34:32 +0000 (+0100)
Subject: Change the call signature to keymap-substitute
X-Git-Tag: emacs-29.0.90~2852^2~235
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cde5dcd441b5db79f39b8664221866566c400b05;p=emacs.git

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 4078a7314f3..3338c383171 100644
--- 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 228d1e05513..157209fcf74 100644
--- 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 b634487ba61..a9331e16049 100644
--- 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