diff src/keymap.c @ 83550:17e0dd217877

Merged from [e-mail]. Patches applied: * [e-mail]/emacs--devo--0--patch-536 Update from CVS * [e-mail]/emacs--devo--0--patch-537 Update from CVS * [e-mail]/emacs--devo--0--patch-538 Update from CVS * [e-mail]/emacs--devo--0--patch-539 Update from CVS * [e-mail]/emacs--devo--0--patch-540 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-541 Update from CVS * [e-mail]/emacs--devo--0--patch-542 Update from CVS * [e-mail]/emacs--devo--0--patch-543 Update from CVS * [e-mail]/emacs--devo--0--patch-544 Update from CVS * [e-mail]/emacs--devo--0--patch-545 Update from CVS * [e-mail]/emacs--devo--0--patch-546 Update from erc--emacs--22 * [e-mail]/emacs--devo--0--patch-547 Update from CVS * [e-mail]/emacs--devo--0--patch-548 Update from CVS * [e-mail]/emacs--devo--0--patch-549 Update from CVS * [e-mail]/emacs--devo--0--patch-550 Update from CVS * [e-mail]/emacs--devo--0--patch-551 Update from CVS * [e-mail]/emacs--devo--0--patch-552 Update from CVS * [e-mail]/emacs--devo--0--patch-553 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-554 Update from CVS * [e-mail]/emacs--devo--0--patch-555 erc-iswitchb: Temporarily enable iswitchb mode * [e-mail]/emacs--devo--0--patch-556 Update from CVS * [e-mail]/emacs--devo--0--patch-557 Update from CVS * [e-mail]/emacs--devo--0--patch-558 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-559 Update from CVS * [e-mail]/emacs--devo--0--patch-560 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-561 Update from CVS * [e-mail]/emacs--devo--0--patch-562 Update from CVS * [e-mail]/emacs--devo--0--patch-563 Update from CVS * [e-mail]/emacs--devo--0--patch-564 Update from CVS * [e-mail]/emacs--devo--0--patch-565 Update from CVS * [e-mail]/emacs--devo--0--patch-566 Update from CVS * [e-mail]/emacs--devo--0--patch-567 Update from CVS * [e-mail]/emacs--devo--0--patch-568 Update from CVS * [e-mail]/emacs--devo--0--patch-569 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-570 Update from CVS * [e-mail]/emacs--devo--0--patch-571 Update from CVS * [e-mail]/emacs--devo--0--patch-572 Update from CVS * [e-mail]/emacs--devo--0--patch-573 Update from CVS * [e-mail]/emacs--devo--0--patch-574 Update from CVS * [e-mail]/emacs--devo--0--patch-575 Update from CVS * [e-mail]/emacs--devo--0--patch-576 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-577 Update from CVS * [e-mail]/emacs--devo--0--patch-578 Update from CVS * [e-mail]/emacs--devo--0--patch-579 Update from CVS * [e-mail]/emacs--devo--0--patch-580 Update from CVS * [e-mail]/emacs--devo--0--patch-581 Update from CVS * [e-mail]/emacs--devo--0--patch-582 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-583 Update from CVS * [e-mail]/emacs--devo--0--patch-584 Fix admin/quick-install-emacs to work with recent versions of autoconf * [e-mail]/gnus--rel--5.10--patch-171 Update from CVS * [e-mail]/gnus--rel--5.10--patch-172 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-173 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-174 Update from CVS * [e-mail]/gnus--rel--5.10--patch-175 Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice. * [e-mail]/gnus--rel--5.10--patch-176 Update from CVS * [e-mail]/gnus--rel--5.10--patch-177 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-178 Update from CVS * [e-mail]/gnus--rel--5.10--patch-179 Update from CVS * [e-mail]/gnus--rel--5.10--patch-180 Update from CVS * [e-mail]/gnus--rel--5.10--patch-181 Update from CVS * [e-mail]/gnus--rel--5.10--patch-182 Update from CVS * [e-mail]/gnus--rel--5.10--patch-183 Update from CVS * [e-mail]/gnus--rel--5.10--patch-184 Update from CVS * [e-mail]/gnus--rel--5.10--patch-185 Merge from emacs--devo--0 git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-590

--- a/src/keymap.c	Sun Dec 03 15:12:18 2006 +0000
+++ b/src/keymap.c	Mon Jan 01 17:38:32 2007 +0000
@@ -1117,7 +1117,8 @@
     or another symbol whose function definition is used, etc.),
  a cons (STRING . DEFN), meaning that DEFN is the definition
     (DEFN should be a valid definition in its own right),
- or a cons (MAP . CHAR), meaning use definition of CHAR in keymap MAP.
+ or a cons (MAP . CHAR), meaning use definition of CHAR in keymap MAP,
+ or an extended menu item definition.  (See info node `Extended Menu Items'.)
 
 If KEYMAP is a sparse keymap with a binding for KEY, the existing
 binding is altered.  If there is no binding for KEY, the new pair
@@ -1240,7 +1241,8 @@
 
 DEFUN ("lookup-key", Flookup_key, Slookup_key, 2, 3, 0,
        doc: /* In keymap KEYMAP, look up key sequence KEY.  Return the definition.
-nil means undefined.  See doc of `define-key' for kinds of definitions.
+A value of nil means undefined.  See doc of `define-key'
+for kinds of definitions.
 
 A number as value means KEY is "too long";
 that is, characters or symbols in it except for the last one
@@ -1615,13 +1617,13 @@
      are read using the keymaps of the buffer clicked on, not
      the current buffer.  So we may have to switch the buffer
      here. */
-  
+
   if (CONSP (position))
     {
       Lisp_Object window;
-      
+
       window = POSN_WINDOW (position);
-	  
+
       if (WINDOWP (window)
 	  && BUFFERP (XWINDOW (window)->buffer)
 	  && XBUFFER (XWINDOW (window)->buffer) != current_buffer)
@@ -1633,13 +1635,13 @@
 	     would not be a problem here, but it is easier to keep
 	     things the same.
 	  */
-	      
+
 	  record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
-	  
+
 	  set_buffer_internal (XBUFFER (XWINDOW (window)->buffer));
 	}
     }
-  
+
   if (! NILP (current_kboard->Voverriding_terminal_local_map))
     {
       value = Flookup_key (current_kboard->Voverriding_terminal_local_map,
@@ -1662,8 +1664,8 @@
 	: MARKERP (position) ? marker_position (position)
 	: PT;
 
-      local_map = get_local_map (pt, current_buffer, Qlocal_map); 
-      keymap = get_local_map (pt, current_buffer, Qkeymap); 
+      local_map = get_local_map (pt, current_buffer, Qlocal_map);
+      keymap = get_local_map (pt, current_buffer, Qkeymap);
 
       if (CONSP (position))
 	{
@@ -1671,7 +1673,7 @@
 
 	  /* For a mouse click, get the local text-property keymap
 	     of the place clicked on, rather than point.  */
-	  
+
 	  if (POSN_INBUFFER_P (position))
 	    {
 	      Lisp_Object pos;
@@ -1682,7 +1684,7 @@
 		{
 		  local_map = get_local_map (XINT (pos),
 					     current_buffer, Qlocal_map);
-		  
+
 		  keymap = get_local_map (XINT (pos),
 					  current_buffer, Qkeymap);
 		}
@@ -1693,12 +1695,12 @@
 	     string displayed via the `display' property,
 	     consider `local-map' and `keymap' properties of
 	     that string.  */
-	  
+
 	  if (string = POSN_STRING (position),
 	      (CONSP (string) && STRINGP (XCAR (string))))
 	    {
 	      Lisp_Object pos, map;
-	      
+
 	      pos = XCDR (string);
 	      string = XCAR (string);
 	      if (INTEGERP (pos)
@@ -1714,7 +1716,7 @@
 		    keymap = map;
 		}
 	    }
-	  
+
 	}
 
       if (! NILP (keymap))