JimB's changes since January 18th

[bpt/emacs.git] / src / data.c

diff --git a/src/data.c b/src/data.c
index 9b45fc6..071cfe8 100644 (file)
--- a/src/data.c
+++ b/src/data.c
@@ -45,6 +45,7 @@ Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only;
 Lisp_Object Qintegerp, Qnatnump, Qsymbolp, Qlistp, Qconsp;
 Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp;
 Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp;
+Lisp_Object Qbuffer_or_string_p;
 Lisp_Object Qboundp, Qfboundp;
 Lisp_Object Qcdr;
 
@@ -255,8 +256,8 @@ DEFUN ("subrp", Fsubrp, Ssubrp, 1, 1, 0, "T if OBJECT is a built-in function.")
   return Qnil;
 }
 
-DEFUN ("compiled-function-p", Fcompiled_function_p, Scompiled_function_p,
-       1, 1, 0, "T if OBJECT is a compiled function object.")
+DEFUN ("byte-code-function-p", Fbyte_code_function_p, Sbyte_code_function_p,
+       1, 1, 0, "T if OBJECT is a byte-compiled function object.")
   (obj)
      Lisp_Object obj;
 {
@@ -307,13 +308,10 @@ DEFUN ("numberp", Fnumberp, Snumberp, 1, 1, 0,
   (obj)
      Lisp_Object obj;
 {
-  if (0
-#ifdef LISP_FLOAT_TYPE
-      || XTYPE (obj) == Lisp_Float
-#endif
-      || XTYPE (obj) == Lisp_Int)
+  if (NUMBERP (obj))
     return Qt;
-  return Qnil;
+  else
+    return Qnil;
 }
 
 DEFUN ("number-or-marker-p", Fnumber_or_marker_p,
@@ -322,10 +320,7 @@ DEFUN ("number-or-marker-p", Fnumber_or_marker_p,
   (obj)
      Lisp_Object obj;
 {
-  if (XTYPE (obj) == Lisp_Int
-#ifdef LISP_FLOAT_TYPE
-      || XTYPE (obj) == Lisp_Float
-#endif
+  if (NUMBERP (obj)
       || XTYPE (obj) == Lisp_Marker)
     return Qt;
   return Qnil;
@@ -640,14 +635,17 @@ swap_in_symval_forwarding (sym, valcontents)
      (REALVALUE BUFFER CURRENT-ALIST-ELEMENT . DEFAULT-VALUE)).
      
      CURRENT-ALIST-ELEMENT is a pointer to an element of BUFFER's
-     local_var_alist, that being the element whose car is this variable.
-     Or it can be a pointer to the (CURRENT-ALIST-ELEMENT . DEFAULT-VALUE), if BUFFER
-     does not have an element in its alist for this variable.
-     
-     If the current buffer is not BUFFER, we store the current REALVALUE value into
-     CURRENT-ALIST-ELEMENT, then find the appropriate alist element for
-     the buffer now current and set up CURRENT-ALIST-ELEMENT.
-     Then we set REALVALUE out of that element, and store into BUFFER.
+     local_var_alist, that being the element whose car is this
+     variable.  Or it can be a pointer to the
+     (CURRENT-ALIST-ELEMENT . DEFAULT-VALUE), if BUFFER does not have
+     an element in its alist for this variable.
+
+     If the current buffer is not BUFFER, we store the current
+     REALVALUE value into CURRENT-ALIST-ELEMENT, then find the
+     appropriate alist element for the buffer now current and set up
+     CURRENT-ALIST-ELEMENT.  Then we set REALVALUE out of that
+     element, and store into BUFFER.
+
      Note that REALVALUE can be a forwarding pointer. */
 
   register Lisp_Object tem1;
@@ -797,7 +795,8 @@ DEFUN ("set", Fset, Sset, 2, 2, 0,
       if ((current_buffer
           != XBUFFER (XCONS (XCONS (valcontents)->cdr)->car))
          || (XTYPE (valcontents) == Lisp_Buffer_Local_Value
-             && XCONS (current_alist_element)->car == current_alist_element))
+             && EQ (XCONS (current_alist_element)->car,
+                    current_alist_element)))
        {
          /* Write out the cached value for the old buffer; copy it
             back to its alist element.  This works if the current
@@ -1004,6 +1003,8 @@ not have their own values for this variable.")
   return val;
 }
 \f
+/* Lisp functions for creating and removing buffer-local variables.  */
+
 DEFUN ("make-variable-buffer-local", Fmake_variable_buffer_local, Smake_variable_buffer_local,
   1, 1, "vMake Variable Buffer Local: ",
   "Make VARIABLE have a separate value for each buffer.\n\
@@ -1098,8 +1099,18 @@ just as if the variable were set.")
        if (current_buffer == XBUFFER (XCONS (XCONS (xs)->cdr)->car))
          XCONS (XCONS (XSYMBOL (sym)->value)->cdr)->car = Qnil; 
       }
-
     }
+
+  /* If the symbol forwards into a C variable, then swap in the
+     variable for this buffer immediately.  If C code modifies the
+     variable before we swap in, then that new value will clobber the
+     default value the next time we swap.  */
+  valcontents = XCONS (XSYMBOL (sym)->value)->car;
+  if (XTYPE (valcontents) == Lisp_Intfwd
+      || XTYPE (valcontents) == Lisp_Boolfwd
+      || XTYPE (valcontents) == Lisp_Objfwd)
+    swap_in_symval_forwarding (sym, XSYMBOL (sym)->value);
+
   return sym;
 }
 
@@ -1162,7 +1173,7 @@ From now on the default value will apply in this buffer.")
    This is like Findirect_function, except that it doesn't signal an
    error if the chain ends up unbound.  */
 Lisp_Object
-indirect_function (object, error)
+indirect_function (object)
   register Lisp_Object object;
 {
   Lisp_Object tortise, hare;
@@ -1452,6 +1463,8 @@ DEFUN ("string-to-int", Fstring_to_int, Sstring_to_int, 1, 1, 0,
 enum arithop
   { Aadd, Asub, Amult, Adiv, Alogand, Alogior, Alogxor, Amax, Amin };
 
+extern Lisp_Object float_arith_driver ();
+
 Lisp_Object
 arith_driver
   (code, nargs, args)
@@ -1649,7 +1662,7 @@ Both must be numbers or markers.")
 
       f1 = XTYPE (num1) == Lisp_Float ? XFLOAT (num1)->data : XINT (num1);
       f2 = XTYPE (num2) == Lisp_Float ? XFLOAT (num2)->data : XINT (num2);
-#ifdef USG
+#if defined (USG) || defined (sun) || defined (ultrix) || defined (hpux)
       f1 = fmod (f1, f2);
 #else
       f1 = drem (f1, f2);
@@ -1844,6 +1857,7 @@ syms_of_data ()
   Qvectorp = intern ("vectorp");
   Qchar_or_string_p = intern ("char-or-string-p");
   Qmarkerp = intern ("markerp");
+  Qbuffer_or_string_p = intern ("buffer-or-string-p");
   Qinteger_or_marker_p = intern ("integer-or-marker-p");
   Qboundp = intern ("boundp");
   Qfboundp = intern ("fboundp");
@@ -1983,6 +1997,7 @@ syms_of_data ()
   staticpro (&Qvectorp);
   staticpro (&Qchar_or_string_p);
   staticpro (&Qmarkerp);
+  staticpro (&Qbuffer_or_string_p);
   staticpro (&Qinteger_or_marker_p);
 #ifdef LISP_FLOAT_TYPE
   staticpro (&Qfloatp);
@@ -2016,7 +2031,7 @@ syms_of_data ()
   defsubr (&Sbufferp);
   defsubr (&Smarkerp);
   defsubr (&Ssubrp);
-  defsubr (&Scompiled_function_p);
+  defsubr (&Sbyte_code_function_p);
   defsubr (&Schar_or_string_p);
   defsubr (&Scar);
   defsubr (&Scdr);