Merge from trunk.

7 files changed, 54 insertions, 65 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 21daa1c8e3b..210f4f6bd60 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-06-20  Paul Eggert  <eggert@cs.ucla.edu>
+2011-06-21  Paul Eggert  <eggert@cs.ucla.edu>
 
         * termcap.c: Don't assume sizes fit in int and never overflow.
         (struct termcap_buffer, tgetent): Use ptrdiff_t, not int, for sizes.
@@ -20,7 +20,7 @@
         * font.h (font_intern_prop): 2nd arg is now ptrdiff_t, not int.
 
         * filelock.c: Fix some buffer overrun and integer overflow issues.
-        (get_boot_time): Don't assume that gzip command string fits in 100 bytes.
+        (get_boot_time): Don't assume gzip command string fits in 100 bytes.
         Reformulate so as not to need the command string.
         Invoke gzip -cd rather than gunzip, as it's more portable.
         (lock_info_type, lock_file_1, lock_file):
@@ -32,8 +32,6 @@
         Check for time_t and/or pid_t out of range, e.g., via a network share.
         Don't alloca where an auto var works fine.
 
-2011-06-19  Paul Eggert  <eggert@cs.ucla.edu>
-
         * fileio.c: Fix some integer overflow issues.
         (file_name_as_directory, Fexpand_file_name, Fsubstitute_in_file_name):
         Don't assume string length fits in int.
@@ -65,7 +63,7 @@
         All uses changed.  This doesn't fix a bug, but it simplifies the
         code away from its former Hollerith-constant appearance, and it's
         one less 'int' to worry about when looking at integer-overflow issues.
-        (string_to_number): Simplify the 2011-04-26 change by invoking xsignal1.
+        (string_to_number): Simplify 2011-04-26 change by invoking xsignal1.
 
         * lisp.h (DEFUN): Remove bogus use of sizeof (struct Lisp_Subr).
         This didn't break anything, but it didn't help either.
@@ -74,8 +72,6 @@
         (LIST_END_P): Remove unused macro and its bogus comment.
         (make_fixnum_or_float): Remove unnecessary cast to EMACS_INT.
 
-2011-06-18  Paul Eggert  <eggert@cs.ucla.edu>
-
         * lisp.h (union Lisp_Object.i): EMACS_INT, not EMACS_UINT.
         This is for consistency with the ordinary, non-USE_LISP_UNION_TYPE,
         implementation.
@@ -91,7 +87,7 @@
         (compute_motion): Use it.  This is just for clarity.
         (Fcompute_motion): Don't assume hscroll and tab offset fit in int.
 
-        * image.c (xbm_image_p): Don't assume stated width and height fit in int.
+        * image.c (xbm_image_p): Don't assume stated width, height fit in int.
 
         * lisp.h (lint_assume): New macro.
         * composite.c (composition_gstring_put_cache):
@@ -115,11 +111,8 @@
         * fns.c (concat): Catch string overflow earlier.
         Do not rely on integer wraparound.
 
-        * dispextern.h (struct it.overlay_strings_charpos): EMACS_INT, not int.
-
-2011-06-17  Paul Eggert  <eggert@cs.ucla.edu>
-
-        * dispextern.h (struct it.selective): Now EMACS_INT, not int.
+        * dispextern.h (struct it.overlay_strings_charpos)
+        (struct it.selective): Now EMACS_INT, not int.
         * xdisp.c (forward_to_next_line_start)
         (back_to_previous_visible_line_start)
         (reseat_at_next_visible_line_start, next_element_from_buffer):
@@ -145,6 +138,29 @@
         (record_overlay_string): Check for size-calculation overflow.
         (init_buffer_once): Check at compile-time, not run-time.
 
+2011-06-20  Deniz Dogan  <deniz@dogan.se>
+
+        * process.c (Fset_process_buffer): Clarify return value in
+        docstring.
+
+2011-06-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * dispnew.c (add_window_display_history): Use BVAR.
+
+        * xdisp.c (debug_method_add): Use BVAR.
+        (check_window_end, dump_glyph_matrix, dump_glyph)
+        (dump_glyph_row, dump_glyph_string): Convert arglist to ANSI C.
+
+        * xfaces.c (check_lface_attrs, check_lface, dump_realized_face):
+        Likewise.
+
+        * xfns.c (Fx_create_frame, x_create_tip_frame): Delay image cache
+        check till after the cache is created in init_frame_faces.
+
+2011-06-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fns.c (Fsafe_length): Yet another int/Lisp_Object mixup.
+
 2011-06-16  Paul Eggert  <eggert@cs.ucla.edu>
 
         * lisp.h: Include <limits.h>, for INT_MAX, LONG_MAX, LLONG_MAX.
diff --git a/src/dispnew.c b/src/dispnew.c
index 2dffc0dce25..dbf052dd099 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -310,8 +310,8 @@ add_window_display_history (struct window *w, const char *msg, int paused_p)
            history_tick++,
            w,
            ((BUFFERP (w->buffer)
-             && STRINGP (XBUFFER (w->buffer)->name))
-            ? SSDATA (XBUFFER (w->buffer)->name)
+             && STRINGP (BVAR (XBUFFER (w->buffer), name)))
+            ? SSDATA (BVAR (XBUFFER (w->buffer), name))
             : "???"),
            paused_p ? " ***paused***" : "");
   strcat (buf, msg);
diff --git a/src/fns.c b/src/fns.c
index 6c9e05655f6..da86d91b2b5 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -170,7 +170,7 @@ which is at least the number of distinct elements.  */)
   uintmax_t lolen = 1;
 
   if (! CONSP (list))
-    return 0;
+    return make_number (0);
 
   /* halftail is used to detect circular lists.  */
   for (tail = halftail = list; ; )
diff --git a/src/process.c b/src/process.c
index 4151c8aeae6..0040d14a0f6 100644
--- a/src/process.c
+++ b/src/process.c
@@ -892,7 +892,8 @@ not the name of the pty that Emacs uses to talk with that terminal.  */)
 
 DEFUN ("set-process-buffer", Fset_process_buffer, Sset_process_buffer,
        2, 2, 0,
-       doc: /* Set buffer associated with PROCESS to BUFFER (a buffer, or nil).  */)
+       doc: /* Set buffer associated with PROCESS to BUFFER (a buffer, or nil).
+Return BUFFER.  */)
   (register Lisp_Object process, Lisp_Object buffer)
 {
   struct Lisp_Process *p;
diff --git a/src/xdisp.c b/src/xdisp.c
index c71acf88719..e985ef9ae4e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2248,8 +2248,7 @@ check_it (it)
    to be---the last row in the current matrix displaying text.  */
 
 static void
-check_window_end (w)
-     struct window *w;
+check_window_end (struct window *w)
 {
   if (!MINI_WINDOW_P (w)
       && !NILP (w->window_end_valid))
@@ -11148,8 +11147,8 @@ debug_method_add (w, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9)
     fprintf (stderr, "%p (%s): %s\n",
              w,
              ((BUFFERP (w->buffer)
-               && STRINGP (XBUFFER (w->buffer)->name))
-              ? SSDATA (XBUFFER (w->buffer)->name)
+               && STRINGP (BVAR (XBUFFER (w->buffer), name)))
+              ? SSDATA (BVAR (XBUFFER (w->buffer), name))
               : "no buffer"),
              buffer);
 }
@@ -16278,9 +16277,7 @@ void dump_glyph (struct glyph_row *, struct glyph *, int);
    GLYPHS > 1 means show glyphs in long form.  */
 
 void
-dump_glyph_matrix (matrix, glyphs)
-     struct glyph_matrix *matrix;
-     int glyphs;
+dump_glyph_matrix (struct glyph_matrix *matrix, int glyphs)
 {
   int i;
   for (i = 0; i < matrix->nrows; ++i)
@@ -16292,10 +16289,7 @@ dump_glyph_matrix (matrix, glyphs)
    the glyph row and area where the glyph comes from.  */
 
 void
-dump_glyph (row, glyph, area)
-     struct glyph_row *row;
-     struct glyph *glyph;
-     int area;
+dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
 {
   if (glyph->type == CHAR_GLYPH)
     {
@@ -16388,9 +16382,7 @@ dump_glyph (row, glyph, area)
    GLYPHS > 1 means show glyphs in long form.  */
 
 void
-dump_glyph_row (row, vpos, glyphs)
-     struct glyph_row *row;
-     int vpos, glyphs;
+dump_glyph_row (struct glyph_row *row, int vpos, int glyphs)
 {
   if (glyphs != 1)
     {
@@ -20471,8 +20463,7 @@ calc_pixel_width_or_height (double *res, struct it *it, Lisp_Object prop,
 #if GLYPH_DEBUG
 
 void
-dump_glyph_string (s)
-     struct glyph_string *s;
+dump_glyph_string (struct glyph_string *s)
 {
   fprintf (stderr, "glyph string\n");
   fprintf (stderr, "  x, y, w, h = %d, %d, %d, %d\n",
diff --git a/src/xfaces.c b/src/xfaces.c
index a56e54c90cd..78ea913526e 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1858,8 +1858,7 @@ the WIDTH times as wide as FACE on FRAME.  */)
 /* Check consistency of Lisp face attribute vector ATTRS.  */
 
 static void
-check_lface_attrs (attrs)
-     Lisp_Object *attrs;
+check_lface_attrs (Lisp_Object *attrs)
 {
   xassert (UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX])
            || IGNORE_DEFFACE_P (attrs[LFACE_FAMILY_INDEX])
@@ -1930,8 +1929,7 @@ check_lface_attrs (attrs)
 /* Check consistency of attributes of Lisp face LFACE (a Lisp vector).  */
 
 static void
-check_lface (lface)
-     Lisp_Object lface;
+check_lface (Lisp_Object lface)
 {
   if (!NILP (lface))
     {
@@ -2008,24 +2006,6 @@ push_named_merge_point (struct named_merge_point *new_named_merge_point,
 }
 
 
-
-#if 0                           /* Seems to be unused.  */
-static Lisp_Object
-internal_resolve_face_name (nargs, args)
-     int nargs;
-     Lisp_Object *args;
-{
-  return Fget (args[0], args[1]);
-}
-
-static Lisp_Object
-resolve_face_name_error (ignore)
-     Lisp_Object ignore;
-{
-  return Qnil;
-}
-#endif
-
 /* Resolve face name FACE_NAME.  If FACE_NAME is a string, intern it
    to make it a symbol.  If FACE_NAME is an alias for another face,
    return that face's name.
@@ -6331,8 +6311,7 @@ where R,G,B are numbers between 0 and 255 and name is an arbitrary string.  */)
 /* Print the contents of the realized face FACE to stderr.  */
 
 static void
-dump_realized_face (face)
-     struct face *face;
+dump_realized_face (struct face *face)
 {
   fprintf (stderr, "ID: %d\n", face->id);
 #ifdef HAVE_X_WINDOWS
diff --git a/src/xfns.c b/src/xfns.c
index abc273c2bdf..20bfa1df3f0 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3156,10 +3156,6 @@ This function is an internal primitive--use `make-frame' instead.  */)
 
   /* With FRAME_X_DISPLAY_INFO set up, this unwind-protect is safe.  */
   record_unwind_protect (unwind_create_frame, frame);
-#if GLYPH_DEBUG
-  image_cache_refcount = FRAME_IMAGE_CACHE (f)->refcount;
-  dpyinfo_refcount = dpyinfo->reference_count;
-#endif /* GLYPH_DEBUG */
 
   /* These colors will be set anyway later, but it's important
      to get the color reference counts right, so initialize them!  */
@@ -3314,6 +3310,11 @@ This function is an internal primitive--use `make-frame' instead.  */)
      happen.  */
   init_frame_faces (f);
 
+#if GLYPH_DEBUG
+  image_cache_refcount = FRAME_IMAGE_CACHE (f)->refcount;
+  dpyinfo_refcount = dpyinfo->reference_count;
+#endif /* GLYPH_DEBUG */
+
   /* The X resources controlling the menu-bar and tool-bar are
      processed specially at startup, and reflected in the mode
      variables; ignore them here.  */
@@ -4606,10 +4607,6 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
 #endif /* USE_TOOLKIT_SCROLL_BARS */
   f->icon_name = Qnil;
   FRAME_X_DISPLAY_INFO (f) = dpyinfo;
-#if GLYPH_DEBUG
-  image_cache_refcount = FRAME_IMAGE_CACHE (f)->refcount;
-  dpyinfo_refcount = dpyinfo->reference_count;
-#endif /* GLYPH_DEBUG */
   f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window;
   f->output_data.x->explicit_parent = 0;
 
@@ -4721,6 +4718,11 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
      happen.  */
   init_frame_faces (f);
 
+#if GLYPH_DEBUG
+  image_cache_refcount = FRAME_IMAGE_CACHE (f)->refcount;
+  dpyinfo_refcount = dpyinfo->reference_count;
+#endif /* GLYPH_DEBUG */
+
   f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window;
 
   x_figure_window_size (f, parms, 0);