Mercurial > emacs

changeset 35258:f585b46c055a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Call get_local_map with new argument list. (Fwhere_is_internal): Rename parameter XKEYMAP to KEYMAP.
author Gerd Moellmann <gerd@gnu.org>
date Fri, 12 Jan 2001 11:19:11 +0000
parents 187c0b3da663
children 228f24b293ec
files src/keymap.c
diffstat 1 files changed, 13 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/keymap.c	Fri Jan 12 11:18:41 2001 +0000
+++ b/src/keymap.c	Fri Jan 12 11:19:11 2001 +0000
@@ -1259,7 +1259,7 @@
 	      RETURN_UNGCPRO (value);
 	  }
 
-      local = get_local_map (PT, current_buffer, keymap);
+      local = get_local_map (PT, current_buffer, Qkeymap);
       if (! NILP (local))
 	{
 	  value = Flookup_key (local, key, accept_default);
@@ -1267,7 +1267,7 @@
 	    RETURN_UNGCPRO (value);
 	}
 
-      local = get_local_map (PT, current_buffer, local_map);
+      local = get_local_map (PT, current_buffer, Qlocal_map);
 
       if (! NILP (local))
 	{
@@ -2239,8 +2239,8 @@
 If optional 4th arg NOINDIRECT is non-nil, don't follow indirections\n\
 to other keymaps or slots.  This makes it possible to search for an\n\
 indirect definition itself.")
-  (definition, xkeymap, firstonly, noindirect)
-     Lisp_Object definition, xkeymap;
+  (definition, keymap, firstonly, noindirect)
+     Lisp_Object definition, keymap;
      Lisp_Object firstonly, noindirect;
 {
   Lisp_Object sequences, keymaps;
@@ -2249,21 +2249,22 @@
   int nomenus = !NILP (firstonly) && !EQ (firstonly, Qnon_ascii);
 
   /* Find the relevant keymaps.  */
-  if (CONSP (xkeymap) && KEYMAPP (XCAR (xkeymap)))
-    keymaps = xkeymap;
-  else if (! NILP (xkeymap))
-    keymaps = Fcons (xkeymap, Fcons (current_global_map, Qnil));
+  if (CONSP (keymap) && KEYMAPP (XCAR (keymap)))
+    keymaps = keymap;
+  else if (! NILP (keymap))
+    keymaps = Fcons (keymap, Fcons (current_global_map, Qnil));
   else
     keymaps =
       Fdelq (Qnil,
 	     nconc2 (Fcurrent_minor_mode_maps (),
-		     Fcons (get_local_map (PT, current_buffer, keymap),
-			    Fcons (get_local_map (PT, current_buffer, local_map),
+		     Fcons (get_local_map (PT, current_buffer, Qkeymap),
+			    Fcons (get_local_map (PT, current_buffer,
+						  Qlocal_map),
 				   Fcons (current_global_map, Qnil)))));
 
   /* Only use caching for the menubar (i.e. called with (def nil t nil).
-     We don't really need to check `xkeymap'.  */
-  if (nomenus && NILP (noindirect) && NILP (xkeymap))
+     We don't really need to check `keymap'.  */
+  if (nomenus && NILP (noindirect) && NILP (keymap))
     {
       /* Check heuristic-consistency of the cache.  */
       if (NILP (Fequal (keymaps, where_is_cache_keymaps)))