Merge from trunk

1 files changed, 5 insertions, 8 deletions

diff --git a/src/data.c b/src/data.c
index cccd53f6076..9490b7ac79a 100644
--- a/src/data.c
+++ b/src/data.c
@@ -82,7 +82,8 @@ Lisp_Object Qnumberp, Qnumber_or_marker_p;
 
 Lisp_Object Qinteger;
 static Lisp_Object Qsymbol, Qstring, Qcons, Qmarker, Qoverlay;
-static Lisp_Object Qfloat, Qwindow_configuration, Qwindow;
+Lisp_Object Qwindow;
+static Lisp_Object Qfloat, Qwindow_configuration;
 Lisp_Object Qprocess;
 static Lisp_Object Qcompiled_function, Qfunction_vector, Qbuffer, Qframe, Qvector;
 static Lisp_Object Qchar_table, Qbool_vector, Qhash_table;
@@ -416,8 +417,7 @@ DEFUN ("byte-code-function-p", Fbyte_code_function_p, Sbyte_code_function_p,
 
 DEFUN ("funvecp", Ffunvecp, Sfunvecp, 1, 1, 0,
        doc: /* Return t if OBJECT is a `function vector' object.  */)
-     (object)
-     Lisp_Object object;
+     (Lisp_Object object)
 {
   return FUNVECP (object) ? Qt : Qnil;
 }
@@ -675,8 +675,6 @@ DEFUN ("fset", Ffset, Sfset, 2, 2, 0,
   return definition;
 }
 
-extern Lisp_Object Qfunction_documentation;
-
 DEFUN ("defalias", Fdefalias, Sdefalias, 2, 3, 0,
        doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION.
 Associates the function with the current load file, if any.
@@ -761,7 +759,7 @@ Value, if non-nil, is a list \(interactive SPEC).  */)
 
   if (SUBRP (fun))
     {
-      char *spec = XSUBR (fun)->intspec;
+      const char *spec = XSUBR (fun)->intspec;
       if (spec)
         return list2 (Qinteractive,
                       (*spec != '(') ? build_string (spec) :
@@ -1876,6 +1874,7 @@ BUFFER defaults to the current buffer.  */)
         Lisp_Object tail, elt, tmp;
         struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym);
         XSETBUFFER (tmp, buf);
+        XSETSYMBOL (variable, sym); /* Update in case of aliasing.  */
 
         for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail))
           {
@@ -2512,8 +2511,6 @@ enum arithop
 
 static Lisp_Object float_arith_driver (double, int, enum arithop,
                                        int, Lisp_Object *);
-extern Lisp_Object fmod_float (Lisp_Object, Lisp_Object);
-
 Lisp_Object
 arith_driver (enum arithop code, int nargs, register Lisp_Object *args)
 {