[Emacs-diffs] Changes to emacs/src/data.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/data.c
diff -c emacs/src/data.c:1.224.4.3 emacs/src/data.c:1.224.4.4
*** emacs/src/data.c:1.224.4.3  Fri Apr 16 12:50:46 2004
--- emacs/src/data.c    Mon Jun 28 07:29:19 2004
***************
*** 761,766 ****
--- 761,779 ----
      return Fcons (make_number (minargs), make_number (maxargs));
  }
  
+ DEFUN ("subr-name", Fsubr_name, Ssubr_name, 1, 1, 0,
+        doc: /* Return name of subroutine SUBR.
+ SUBR must be a built-in function.  */)
+      (subr)
+      Lisp_Object subr;
+ {
+   const char *name;
+   if (!SUBRP (subr))
+     wrong_type_argument (Qsubrp, subr);
+   name = XSUBR (subr)->symbol_name;
+   return make_string (name, strlen (name));
+ }
+ 
  DEFUN ("interactive-form", Finteractive_form, Sinteractive_form, 1, 1, 0,
         doc: /* Return the interactive form of CMD or nil if none.
  CMD must be a command.  Value, if non-nil, is a list
***************
*** 1394,1400 ****
  }
  
  DEFUN ("set-default", Fset_default, Sset_default, 2, 2, 0,
!        doc: /* Set SYMBOL's default value to VAL.  SYMBOL and VAL are 
evaluated.
  The default value is seen in buffers that do not have their own values
  for this variable.  */)
       (symbol, value)
--- 1407,1413 ----
  }
  
  DEFUN ("set-default", Fset_default, Sset_default, 2, 2, 0,
!        doc: /* Set SYMBOL's default value to VALUE.  SYMBOL and VALUE are 
evaluated.
  The default value is seen in buffers that do not have their own values
  for this variable.  */)
       (symbol, value)
***************
*** 1455,1465 ****
  that do not have their own values for the variable.
  
  More generally, you can use multiple variables and values, as in
!   (setq-default SYMBOL VALUE SYMBOL VALUE...)
! This sets each SYMBOL's default value to the corresponding VALUE.
! The VALUE for the Nth SYMBOL can refer to the new default values
! of previous SYMs.
! usage: (setq-default SYMBOL VALUE [SYMBOL VALUE...])  */)
       (args)
       Lisp_Object args;
  {
--- 1468,1478 ----
  that do not have their own values for the variable.
  
  More generally, you can use multiple variables and values, as in
!   (setq-default VAR VALUE VAR VALUE...)
! This sets each VAR's default value to the corresponding VALUE.
! The VALUE for the Nth VAR can refer to the new default values
! of previous VARs.
! usage: (setq-default VAR VALUE [VAR VALUE...])  */)
       (args)
       Lisp_Object args;
  {
***************
*** 1946,1953 ****
        if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size)
        args_out_of_range (array, idx);
  
!       val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / 
BITS_PER_CHAR];
!       return (val & (1 << (idxval % BITS_PER_CHAR)) ? Qt : Qnil);
      }
    else if (CHAR_TABLE_P (array))
      {
--- 1959,1966 ----
        if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size)
        args_out_of_range (array, idx);
  
!       val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / 
BOOL_VECTOR_BITS_PER_CHAR];
!       return (val & (1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR)) ? Qt : Qnil);
      }
    else if (CHAR_TABLE_P (array))
      {
***************
*** 2005,2017 ****
        if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size)
        args_out_of_range (array, idx);
  
!       val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / 
BITS_PER_CHAR];
  
        if (! NILP (newelt))
!       val |= 1 << (idxval % BITS_PER_CHAR);
        else
!       val &= ~(1 << (idxval % BITS_PER_CHAR));
!       XBOOL_VECTOR (array)->data[idxval / BITS_PER_CHAR] = val;
      }
    else if (CHAR_TABLE_P (array))
      {
--- 2018,2030 ----
        if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size)
        args_out_of_range (array, idx);
  
!       val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / 
BOOL_VECTOR_BITS_PER_CHAR];
  
        if (! NILP (newelt))
!       val |= 1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR);
        else
!       val &= ~(1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR));
!       XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR] = val;
      }
    else if (CHAR_TABLE_P (array))
      {
***************
*** 2581,2586 ****
--- 2594,2603 ----
       int nargs;
       Lisp_Object *args;
  {
+   int argnum;
+   for (argnum = 2; argnum < nargs; argnum++)
+     if (FLOATP (args[argnum]))
+       return float_arith_driver (0, 0, Adiv, nargs, args);
    return arith_driver (Adiv, nargs, args);
  }
  
***************
*** 3215,3220 ****
--- 3232,3238 ----
    defsubr (&Slognot);
    defsubr (&Sbyteorder);
    defsubr (&Ssubr_arity);
+   defsubr (&Ssubr_name);
  
    XSYMBOL (Qwholenump)->function = XSYMBOL (Qnatnump)->function;