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

[Juanma Barranquero]

Index: emacs/src/keymap.c
diff -c emacs/src/keymap.c:1.262 emacs/src/keymap.c:1.263
*** emacs/src/keymap.c:1.262    Mon May 20 04:06:00 2002
--- emacs/src/keymap.c  Sun Jun  2 21:39:27 2002
***************
*** 477,487 ****
  
  /* Look up IDX in MAP.  IDX may be any sort of event.
     Note that this does only one level of lookup; IDX must be a single
!    event, not a sequence. 
  
     If T_OK is non-zero, bindings for Qt are treated as default
     bindings; any key left unmentioned by other tables and bindings is
!    given the binding of Qt.  
  
     If T_OK is zero, bindings for Qt are not treated specially.
  
--- 477,487 ----
  
  /* Look up IDX in MAP.  IDX may be any sort of event.
     Note that this does only one level of lookup; IDX must be a single
!    event, not a sequence.
  
     If T_OK is non-zero, bindings for Qt are treated as default
     bindings; any key left unmentioned by other tables and bindings is
!    given the binding of Qt.
  
     If T_OK is zero, bindings for Qt are not treated specially.
  
***************
*** 572,578 ****
        else if (CONSP (binding))
          {
            Lisp_Object key = XCAR (binding);
!           
            if (EQ (key, idx))
              val = XCDR (binding);
            else if (t_ok
--- 572,578 ----
        else if (CONSP (binding))
          {
            Lisp_Object key = XCAR (binding);
! 
            if (EQ (key, idx))
              val = XCDR (binding);
            else if (t_ok
***************
*** 1188,1194 ****
  {
    Lisp_Object parsed, base, name, assoc;
    int modifiers;
!         
    parsed = parse_modifiers (c);
    modifiers = (int) XUINT (XCAR (XCDR (parsed)));
    base = XCAR (parsed);
--- 1188,1194 ----
  {
    Lisp_Object parsed, base, name, assoc;
    int modifiers;
! 
    parsed = parse_modifiers (c);
    modifiers = (int) XUINT (XCAR (XCDR (parsed)));
    base = XCAR (parsed);
***************
*** 1217,1223 ****
  
        c = reorder_modifiers (c);
        keystring = concat2 (build_string (new_mods), XCDR (assoc));
!               
        error ((modifiers & ~meta_modifier
              ? "To bind the key %s, use [?%s], not [%s]"
              : "To bind the key %s, use \"%s\", not [%s]"),
--- 1217,1223 ----
  
        c = reorder_modifiers (c);
        keystring = concat2 (build_string (new_mods), XCDR (assoc));
! 
        error ((modifiers & ~meta_modifier
              ? "To bind the key %s, use [?%s], not [%s]"
              : "To bind the key %s, use \"%s\", not [%s]"),
***************
*** 1310,1316 ****
                newsize = cmm_size == 0 ? 30 : cmm_size * 2;
                allocsize = newsize * sizeof *newmodes;
  
!               /* Use malloc here.  See the comment above this function. 
                   Avoid realloc here; it causes spurious traps on GNU/Linux 
[KFS] */
                BLOCK_INPUT;
                newmodes = (Lisp_Object *) malloc (allocsize);
--- 1310,1316 ----
                newsize = cmm_size == 0 ? 30 : cmm_size * 2;
                allocsize = newsize * sizeof *newmodes;
  
!               /* Use malloc here.  See the comment above this function.
                   Avoid realloc here; it causes spurious traps on GNU/Linux 
[KFS] */
                BLOCK_INPUT;
                newmodes = (Lisp_Object *) malloc (allocsize);
***************
*** 1335,1341 ****
                    cmm_maps = newmaps;
                  }
                UNBLOCK_INPUT;
!             
                if (newmodes == NULL || newmaps == NULL)
                  break;
                cmm_size = newsize;
--- 1335,1341 ----
                    cmm_maps = newmaps;
                  }
                UNBLOCK_INPUT;
! 
                if (newmodes == NULL || newmaps == NULL)
                  break;
                cmm_size = newsize;
***************
*** 1440,1446 ****
        goto done;
      }
    else
!     { 
        Lisp_Object local;
  
        local = get_local_map (PT, current_buffer, Qkeymap);
--- 1440,1446 ----
        goto done;
      }
    else
!     {
        Lisp_Object local;
  
        local = get_local_map (PT, current_buffer, Qkeymap);
***************
*** 1481,1494 ****
  
    /* If the result of the ordinary keymap lookup is an interactive
       command, look for a key binding (ie. remapping) for that command.  */
!      
    if (NILP (no_remap) && SYMBOLP (value))
      {
        Lisp_Object value1;
        if (value1 = Fremap_command (value), !NILP (value1))
        value = value1;
      }
!   
    return value;
  }
  
--- 1481,1494 ----
  
    /* If the result of the ordinary keymap lookup is an interactive
       command, look for a key binding (ie. remapping) for that command.  */
! 
    if (NILP (no_remap) && SYMBOLP (value))
      {
        Lisp_Object value1;
        if (value1 = Fremap_command (value), !NILP (value1))
        value = value1;
      }
! 
    return value;
  }
  
***************
*** 2486,2492 ****
        Lisp_Object *defns;
        int i, j, n;
        struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
!       
        /* Check heuristic-consistency of the cache.  */
        if (NILP (Fequal (keymaps, where_is_cache_keymaps)))
        where_is_cache = Qnil;
--- 2486,2492 ----
        Lisp_Object *defns;
        int i, j, n;
        struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
! 
        /* Check heuristic-consistency of the cache.  */
        if (NILP (Fequal (keymaps, where_is_cache_keymaps)))
        where_is_cache = Qnil;
***************
*** 2925,2931 ****
       Lisp_Object definition, args;
  {
    register Lisp_Object tem1;
!   int column = current_column ();
    int description_column;
  
    /* If column 16 is no good, go to col 32;
--- 2925,2931 ----
       Lisp_Object definition, args;
  {
    register Lisp_Object tem1;
!   int column = (int) current_column (); /* iftc */
    int description_column;
  
    /* If column 16 is no good, go to col 32;
***************
*** 3481,3487 ****
      apropos_accumulate = Fcons (symbol, apropos_accumulate);
  }
  
! DEFUN ("apropos-internal", Fapropos_internal, Sapropos_internal, 1, 2, 0, 
         doc: /* Show all symbols whose names contain match for REGEXP.
  If optional 2nd arg PREDICATE is non-nil, (funcall PREDICATE SYMBOL) is done
  for each symbol and a symbol is mentioned only if that returns non-nil.
--- 3481,3487 ----
      apropos_accumulate = Fcons (symbol, apropos_accumulate);
  }
  
! DEFUN ("apropos-internal", Fapropos_internal, Sapropos_internal, 1, 2, 0,
         doc: /* Show all symbols whose names contain match for REGEXP.
  If optional 2nd arg PREDICATE is non-nil, (funcall PREDICATE SYMBOL) is done
  for each symbol and a symbol is mentioned only if that returns non-nil.
***************
*** 3585,3591 ****
  Each element is a keymap alist just like `minor-mode-map-alist', or a
  symbol with a variable binding which is a keymap alist, and it is used
  the same way.  The "active" keymaps in each alist are used before
! `minor-mode-map-alist' and `minor-mode-overriding-map-alist'.  */); 
    Vemulation_mode_map_alists = Qnil;
  
  
--- 3585,3591 ----
  Each element is a keymap alist just like `minor-mode-map-alist', or a
  symbol with a variable binding which is a keymap alist, and it is used
  the same way.  The "active" keymaps in each alist are used before
! `minor-mode-map-alist' and `minor-mode-overriding-map-alist'.  */);
    Vemulation_mode_map_alists = Qnil;