master 2a5169156b3: (access_keymap): Remove 'autoload' arg

branch: master
commit 2a5169156b39649711ff8bd71a7ff4333968264b
Author: Stefan Monnier <[email protected]>
Commit: Stefan Monnier <[email protected]>

    (access_keymap): Remove 'autoload' arg
    
    The argument was always true anyway.
    
    * src/keymap.h (access_keymap):
    * src/keymap.c (access_keymap_1, access_keymap): Remove 'autoload' arg.
    * src/keyboard.c (read_char, menu_bar_items, tab_bar_items)
    (tool_bar_items, follow_key, access_keymap_keyremap): Simplify accordingly.
---
 src/keyboard.c | 12 ++++++------
 src/keymap.c   | 29 ++++++++++++++---------------
 src/keymap.h   |  2 +-
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/keyboard.c b/src/keyboard.c
index 970023f1157..1129fd3b58c 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3110,7 +3110,7 @@ read_char (int commandflag, Lisp_Object map,
      and loop around to read another event.  */
   save = Vquit_flag;
   Vquit_flag = Qnil;
-  tem = access_keymap (get_keymap (Vspecial_event_map, 0, 1), c, 0, 0, 1);
+  tem = access_keymap (get_keymap (Vspecial_event_map, 0, 1), c, 0, 0);
   Vquit_flag = save;
 
   if (!NILP (tem))
@@ -8721,7 +8721,7 @@ menu_bar_items (Lisp_Object old)
   for (mapno = nmaps - 1; mapno >= 0; mapno--)
     if (!NILP (maps[mapno]))
       {
-	def = get_keymap (access_keymap (maps[mapno], Qmenu_bar, 1, 0, 1),
+	def = get_keymap (access_keymap (maps[mapno], Qmenu_bar, 1, 0),
 			  0, 1);
 	if (CONSP (def))
 	  {
@@ -9279,7 +9279,7 @@ tab_bar_items (Lisp_Object reuse, int *nitems)
       {
 	Lisp_Object keymap;
 
-	keymap = get_keymap (access_keymap (maps[i], Qtab_bar, 1, 0, 1), 0, 1);
+	keymap = get_keymap (access_keymap (maps[i], Qtab_bar, 1, 0), 0, 1);
 	if (CONSP (keymap))
 	  map_keymap (keymap, process_tab_bar_item, Qnil, NULL, 1);
       }
@@ -9663,7 +9663,7 @@ tool_bar_items (Lisp_Object reuse, int *nitems)
       {
 	Lisp_Object keymap;
 
-	keymap = get_keymap (access_keymap (maps[i], Qtool_bar, 1, 0, 1), 0, 1);
+	keymap = get_keymap (access_keymap (maps[i], Qtool_bar, 1, 0), 0, 1);
 	if (CONSP (keymap))
 	  map_keymap (keymap, process_tool_bar_item, Qnil, NULL, 1);
       }
@@ -10158,7 +10158,7 @@ static Lisp_Object
 follow_key (Lisp_Object keymap, Lisp_Object key)
 {
   return access_keymap (get_keymap (keymap, 0, 1),
-			key, 1, 0, 1);
+			key, 1, 0);
 }
 
 static Lisp_Object
@@ -10438,7 +10438,7 @@ access_keymap_keyremap (Lisp_Object map, Lisp_Object key, Lisp_Object prompt,
   Lisp_Object next;
   specpdl_ref count;
 
-  next = access_keymap (map, key, 1, 0, 1);
+  next = access_keymap (map, key, 1, 0);
 
   /* Handle a symbol whose function definition is a keymap
      or an array.  */
diff --git a/src/keymap.c b/src/keymap.c
index ec0b966d435..2eabbdfa077 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -325,7 +325,7 @@ Return PARENT.  PARENT should be nil or another keymap.  */)
 
 static Lisp_Object
 access_keymap_1 (Lisp_Object map, Lisp_Object idx,
-		 bool t_ok, bool noinherit, bool autoload)
+		 bool t_ok, bool noinherit)
 {
   /* If idx is a list (some sort of mouse click, perhaps?),
      the index we want to use is the car of the list, which
@@ -352,8 +352,8 @@ access_keymap_1 (Lisp_Object map, Lisp_Object idx,
       if (XFIXNUM (meta_prefix_char) & CHAR_META)
 	meta_prefix_char = make_fixnum (27);
       event_meta_binding = access_keymap_1 (map, meta_prefix_char, t_ok,
-					    noinherit, autoload);
-      event_meta_map = get_keymap (event_meta_binding, 0, autoload);
+					    noinherit);
+      event_meta_map = get_keymap (event_meta_binding, 0, true);
       if (CONSP (event_meta_map))
 	{
 	  map = event_meta_map;
@@ -378,13 +378,13 @@ access_keymap_1 (Lisp_Object map, Lisp_Object idx,
 
     for (tail = (CONSP (map) && EQ (Qkeymap, XCAR (map))) ? XCDR (map) : map;
 	 (CONSP (tail)
-	  || (tail = get_keymap (tail, 0, autoload), CONSP (tail)));
+	  || (tail = get_keymap (tail, 0, true), CONSP (tail)));
 	 tail = XCDR (tail))
       {
 	/* Qunbound in VAL means we have found no binding.  */
 	Lisp_Object val = Qunbound;
 	Lisp_Object binding = XCAR (tail);
-	Lisp_Object submap = get_keymap (binding, 0, autoload);
+	Lisp_Object submap = get_keymap (binding, 0, true);
 
 	if (EQ (binding, Qkeymap))
 	  {
@@ -396,9 +396,8 @@ access_keymap_1 (Lisp_Object map, Lisp_Object idx,
 		Lisp_Object parent_entry;
 		eassert (KEYMAPP (retval));
 		parent_entry
-		  = get_keymap (access_keymap_1 (tail, idx,
-						 t_ok, 0, autoload),
-				0, autoload);
+		  = get_keymap (access_keymap_1 (tail, idx, t_ok, 0),
+				0, true);
 		if (KEYMAPP (parent_entry))
 		  {
 		    if (CONSP (retval_tail))
@@ -414,7 +413,7 @@ access_keymap_1 (Lisp_Object map, Lisp_Object idx,
 	  }
 	else if (CONSP (submap))
 	  {
-	    val = access_keymap_1 (submap, idx, t_ok, noinherit, autoload);
+	    val = access_keymap_1 (submap, idx, t_ok, noinherit);
 	  }
 	else if (CONSP (binding))
 	  {
@@ -458,7 +457,7 @@ access_keymap_1 (Lisp_Object map, Lisp_Object idx,
 		 keymaps of lower precedence).  */
 	      val = Qnil;
 
-	    val = get_keyelt (val, autoload);
+	    val = get_keyelt (val, true);
 
 	    if (!KEYMAPP (val))
 	      {
@@ -484,15 +483,15 @@ access_keymap_1 (Lisp_Object map, Lisp_Object idx,
       }
 
     return BASE_EQ (Qunbound, retval)
-           ? get_keyelt (t_binding, autoload) : retval;
+           ? get_keyelt (t_binding, true) : retval;
   }
 }
 
 Lisp_Object
 access_keymap (Lisp_Object map, Lisp_Object idx,
-	       bool t_ok, bool noinherit, bool autoload)
+	       bool t_ok, bool noinherit)
 {
-  Lisp_Object val = access_keymap_1 (map, idx, t_ok, noinherit, autoload);
+  Lisp_Object val = access_keymap_1 (map, idx, t_ok, noinherit);
   return BASE_EQ (val, Qunbound) ? Qnil : val;
 }
 
@@ -1187,7 +1186,7 @@ binding KEY to DEF is added at the front of KEYMAP.  */)
       if (idx == length)
 	return store_in_keymap (keymap, c, def, !NILP (remove));
 
-      Lisp_Object cmd = access_keymap (keymap, c, 0, 1, 1);
+      Lisp_Object cmd = access_keymap (keymap, c, 0, 1);
 
       /* If this key is undefined, make it a prefix.  */
       if (NILP (cmd))
@@ -1273,7 +1272,7 @@ lookup_key_1 (Lisp_Object keymap, Lisp_Object key, Lisp_Object accept_default)
       if (!FIXNUMP (c) && !SYMBOLP (c) && !CONSP (c) && !STRINGP (c))
 	message_with_string ("Key sequence contains invalid event %s", c, 1);
 
-      Lisp_Object cmd = access_keymap (keymap, c, t_ok, 0, 1);
+      Lisp_Object cmd = access_keymap (keymap, c, t_ok, 0);
       if (idx == length)
 	return cmd;
 
diff --git a/src/keymap.h b/src/keymap.h
index 1280b335238..821429448ab 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -34,7 +34,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #define KEYMAPP(m) (!NILP (get_keymap (m, false, false)))
 extern Lisp_Object current_global_map;
 extern char *push_key_description (EMACS_INT, char *);
-extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, bool, bool, bool);
+extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, bool, bool);
 extern Lisp_Object get_keymap (Lisp_Object, bool, bool);
 extern ptrdiff_t current_minor_maps (Lisp_Object **, Lisp_Object **);
 extern void initial_define_lispy_key (Lisp_Object, const char *, const char *);