[Emacs-diffs] Changes to emacs/src/keymap.c

[Stefan Monnier]

Index: emacs/src/keymap.c
diff -c emacs/src/keymap.c:1.276 emacs/src/keymap.c:1.277
*** emacs/src/keymap.c:1.276    Sat Feb 22 17:18:42 2003
--- emacs/src/keymap.c  Sat Mar 15 19:06:59 2003
***************
*** 2240,2245 ****
--- 2240,2247 ----
    return Qnil;
  }
  
+ static Lisp_Object Vmenu_events;
+ 
  /* This function can GC if Flookup_key autoloads any keymaps.  */
  
  static Lisp_Object
***************
*** 2278,2284 ****
    for (; !NILP (maps); maps = Fcdr (maps))
      {
        /* Key sequence to reach map, and the map that it reaches */
!       register Lisp_Object this, map;
  
        /* In order to fold [META-PREFIX-CHAR CHAR] sequences into
         [M-CHAR] sequences, check if last character of the sequence
--- 2280,2286 ----
    for (; !NILP (maps); maps = Fcdr (maps))
      {
        /* Key sequence to reach map, and the map that it reaches */
!       register Lisp_Object this, map, tem;
  
        /* In order to fold [META-PREFIX-CHAR CHAR] sequences into
         [M-CHAR] sequences, check if last character of the sequence
***************
*** 2294,2300 ****
  
        /* if (nomenus && !ascii_sequence_p (this)) */
        if (nomenus && XINT (last) >= 0
!         && !INTEGERP (Faref (this, make_number (0))))
        /* If no menu entries should be returned, skip over the
           keymaps bound to `menu-bar' and `tool-bar' and other
           non-ascii prefixes like `C-down-mouse-2'.  */
--- 2296,2303 ----
  
        /* if (nomenus && !ascii_sequence_p (this)) */
        if (nomenus && XINT (last) >= 0
!         && SYMBOLP (tem = Faref (this, make_number (0)))
!         && !NILP (Fmemq (XCAR (parse_modifiers (tem)), Vmenu_events)))
        /* If no menu entries should be returned, skip over the
           keymaps bound to `menu-bar' and `tool-bar' and other
           non-ascii prefixes like `C-down-mouse-2'.  */
***************
*** 3496,3502 ****
       Lisp_Object regexp, predicate;
  {
    Lisp_Object tem;
-   struct gcpro gcpro1, gcpro2;
    CHECK_STRING (regexp);
    apropos_predicate = predicate;
    apropos_accumulate = Qnil;
--- 3499,3504 ----
***************
*** 3626,3631 ****
--- 3628,3642 ----
  This keymap works like `function-key-map', but comes after that,
  and applies even for keys that have ordinary bindings.  */);
    Vkey_translation_map = Qnil;
+ 
+   staticpro (&Vmenu_events);
+   Vmenu_events = Fcons (intern ("menu-bar"),
+                        Fcons (intern ("tool-bar"),
+                               Fcons (intern ("mouse-1"),
+                                      Fcons (intern ("mouse-2"),
+                                             Fcons (intern ("mouse-3"),
+                                                    Qnil)))));
+ 
  
    Qsingle_key_description = intern ("single-key-description");
    staticpro (&Qsingle_key_description);