Merge changes from emacs-23 branch

8 files changed, 118 insertions, 32 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 73fecea5972..ac466de0eee 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -1,5 +1,5 @@
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001,
-#   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
@@ -51,7 +51,7 @@ handle SIGALRM ignore
 # Using a constant runs into GDB bugs sometimes.
 define xgetptr
   set $bugfix = $arg0
-  set $ptr = (gdb_use_union ? $bugfix.u.val : $bugfix & $valmask) | gdb_data_seg_bits
+  set $ptr = (gdb_use_union ? (gdb_use_lsb ? $bugfix.u.val << gdb_gctypebits : $bugfix.u.val) : $bugfix & $valmask) | gdb_data_seg_bits
 end
 
 define xgetint
@@ -1227,7 +1227,8 @@ define xbacktrace
       xprintsym (*$bt->function)
       printf " (0x%x)\n", $bt->args
     else
-      printf "0x%x ", *$bt->function
+      xgetptr *$bt->function
+      printf "0x%x ", $ptr
       if $type == Lisp_Vectorlike
         xgetptr (*$bt->function)
         set $size = ((struct Lisp_Vector *) $ptr)->size
diff --git a/src/ChangeLog b/src/ChangeLog
index d03b16a7092..879ecc94d72 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,54 @@
+2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * keyboard.c (Vselect_active_regions): Doc fix.  (Bug#7702)
+
+2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * image.c <Qlibpng_version>: New variable.
+        (syms_of_image): Intern and staticpro it.  Set its value to the
+        version of PNG library we were compiled with.
+        (my_png_error, png_load): Avoid GCC warnings about direct access
+        to png_ptr->jmpbuf.  (Bug#7716)
+        (png_jmpbuf): New macro.
+        (my_png_error, png_load): Use it instead of #ifdef'ing according
+        to PNG_LIBPNG_VER_MAJOR and PNG_LIBPNG_VER_MINOR.
+
+2011-01-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * .gdbinit (xgetptr): Fix the union+lsb case.
+        (xbacktrace): Fix the union case.
+
+2011-01-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.c (Fmove_to_window_line): Avoid abort when called in a buffer
+        different from selected-window's.
+
+2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * keyboard.c (parse_menu_item): Prepend "  " to the key sequence
+        equivalent of a menu item when the key sequence is given by the
+        `:keys' attribute.  (Bug#7662)
+
+        * xdisp.c (Fformat_mode_line): Doc fix: no need to state that only
+        the basic faces are supported.
+
+2011-01-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_check_fullscreen): Fix pixel/character mixup.
+
+2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (Fformat_mode_line): Fix last change.
+
+2011-01-02  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (Fformat_mode_line): Restrict the FACE argument to basic
+        faces (Bug#7587).
+
+2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * fileio.c (Fexpand_file_name): One more doc fix.
+
 2011-01-01  Chong Yidong  <cyd@stupidchicken.com>
 
         * gtkutil.c (xg_get_tool_bar_widgets): Use NULL for a missing
diff --git a/src/fileio.c b/src/fileio.c
index c2b93a6bd8b..881dc92acab 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -782,6 +782,8 @@ DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0,
 Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative
 \(does not start with slash or tilde); if DEFAULT-DIRECTORY is nil or missing,
 the current buffer's value of `default-directory' is used.
+NAME should be a string that is a valid file name for the underlying
+filesystem.
 File name components that are `.' are removed, and
 so are file name components followed by `..', along with the `..' itself;
 note that these simplifications are done without checking the resulting
diff --git a/src/image.c b/src/image.c
index 07f573ca893..41c9cb8f534 100644
--- a/src/image.c
+++ b/src/image.c
@@ -94,6 +94,11 @@ typedef struct w32_bitmap_record Bitmap_Record;
    without modifying lots of files).  */
 extern void x_query_colors (struct frame *f, XColor *colors, int ncolors);
 extern void x_query_color (struct frame *f, XColor *color);
+
+/* Version of libpng that we were compiled with, or -1 if no PNG
+   support was compiled in.  This is tested by w32-win.el to correctly
+   set up the alist used to search for PNG libraries.  */
+Lisp_Object Qlibpng_version;
 #endif /* HAVE_NTGUI */
 
 #ifdef HAVE_NS
@@ -5523,6 +5528,12 @@ init_png_functions (Lisp_Object libraries)
 
 #endif /* HAVE_NTGUI */
 
+/* libpng before 1.4.0 didn't have png_jmpbuf; v1.4.0 and later
+   deprecate direct access to png_ptr fields.  */
+#ifndef png_jmpbuf
+# define png_jmpbuf(PTR)  ((PTR)->jmpbuf)
+#endif
+
 /* Error and warning handlers installed when the PNG library
    is initialized.  */
 
@@ -5530,8 +5541,10 @@ static void
 my_png_error (png_struct *png_ptr, const char *msg)
 {
   xassert (png_ptr != NULL);
+  /* Avoid compiler warning about deprecated direct access to
+     png_ptr's fields in libpng versions 1.4.x.  */
   image_error ("PNG error: %s", build_string (msg), Qnil);
-  longjmp (png_ptr->jmpbuf, 1);
+  longjmp (png_jmpbuf (png_ptr), 1);
 }
 
 
@@ -5693,7 +5706,7 @@ png_load (struct frame *f, struct image *img)
 
   /* Set error jump-back.  We come back here when the PNG library
      detects an error.  */
-  if (setjmp (png_ptr->jmpbuf))
+  if (setjmp (png_jmpbuf (png_ptr)))
     {
     error:
       if (png_ptr)
@@ -8776,6 +8789,16 @@ non-numeric, there is no explicit limit on the size of images.  */);
   staticpro (&QCpt_height);
 #endif /* HAVE_GHOSTSCRIPT */
 
+#ifdef HAVE_NTGUI
+  Qlibpng_version = intern_c_string ("libpng-version");
+  staticpro (&Qlibpng_version);
+#if HAVE_PNG
+  SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (PNG_LIBPNG_VER));
+#else
+  SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (-1));
+#endif
+#endif
+
 #if defined (HAVE_XPM) || defined (HAVE_NS)
   Qxpm = intern_c_string ("xpm");
   staticpro (&Qxpm);
diff --git a/src/keyboard.c b/src/keyboard.c
index 27c311d72e2..7759549fa23 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7968,7 +7968,7 @@ parse_menu_item (Lisp_Object item, int inmenubar)
     /* The previous code preferred :key-sequence to :keys, so we
        preserve this behavior.  */
     if (STRINGP (keyeq) && !CONSP (keyhint))
-      keyeq = Fsubstitute_command_keys (keyeq);
+      keyeq = concat2 (build_string ("  "), Fsubstitute_command_keys (keyeq));
     else
       {
         Lisp_Object prefix = keyeq;
@@ -12386,7 +12386,7 @@ and tool-bar buttons.  */);
 
   DEFVAR_LISP ("select-active-regions",
                &Vselect_active_regions,
-               doc: /* If non-nil, an active region automatically becomes the window selection.
+               doc: /* If non-nil, an active region automatically sets the primary selection.
 If the value is `only', only temporarily active regions (usually made
 by mouse-dragging or shift-selection) set the window selection.
 
diff --git a/src/window.c b/src/window.c
index 920a528a03e..b0171436088 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5762,6 +5762,12 @@ zero means top of window, negative means relative to bottom of window.  */)
   int this_scroll_margin;
 #endif
 
+  if (!(BUFFERP (w->buffer)
+        && XBUFFER (w->buffer) == current_buffer))
+    /* This test is needed to make sure PT/PT_BYTE make sense in w->buffer
+       when passed below to set_marker_both.  */
+    error ("move-to-window-line called from unrelated buffer");
+  
   window = selected_window;
   start = marker_position (w->start);
   if (start < BEGV || start > ZV)
diff --git a/src/xdisp.c b/src/xdisp.c
index 7a299055185..4e15e8a5f6d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19068,23 +19068,27 @@ DEFUN ("format-mode-line", Fformat_mode_line, Sformat_mode_line,
 First arg FORMAT specifies the mode line format (see `mode-line-format'
 for details) to use.
 
-Optional second arg FACE specifies the face property to put
-on all characters for which no face is specified.
-The value t means whatever face the window's mode line currently uses
-\(either `mode-line' or `mode-line-inactive', depending).
-A value of nil means the default is no face property.
-If FACE is an integer, the value string has no text properties.
+By default, the format is evaluated for the currently selected window.
+
+Optional second arg FACE specifies the face property to put on all
+characters for which no face is specified.  The value nil means the
+default face.  The value t means whatever face the window's mode line
+currently uses (either `mode-line' or `mode-line-inactive',
+depending on whether the window is the selected window or not).
+An integer value means the value string has no text
+properties.
 
 Optional third and fourth args WINDOW and BUFFER specify the window
 and buffer to use as the context for the formatting (defaults
-are the selected window and the window's buffer).  */)
-  (Lisp_Object format, Lisp_Object face, Lisp_Object window, Lisp_Object buffer)
+are the selected window and the WINDOW's buffer).  */)
+     (Lisp_Object format, Lisp_Object face,
+      Lisp_Object window, Lisp_Object buffer)
 {
   struct it it;
   int len;
   struct window *w;
   struct buffer *old_buffer = NULL;
-  int face_id = -1;
+  int face_id;
   int no_props = INTEGERP (face);
   int count = SPECPDL_INDEX ();
   Lisp_Object str;
@@ -19107,15 +19111,14 @@ are the selected window and the window's buffer).  */)
   if (no_props)
     face = Qnil;
 
-  if (!NILP (face))
-    {
-      if (EQ (face, Qt))
-        face = (EQ (window, selected_window) ? Qmode_line : Qmode_line_inactive);
-      face_id = lookup_named_face (XFRAME (WINDOW_FRAME (w)), face, 0);
-    }
-
-  if (face_id < 0)
-    face_id = DEFAULT_FACE_ID;
+  face_id = (NILP (face) || EQ (face, Qdefault)) ? DEFAULT_FACE_ID
+    : EQ (face, Qt) ? (EQ (window, selected_window)
+                       ? MODE_LINE_FACE_ID : MODE_LINE_INACTIVE_FACE_ID)
+    : EQ (face, Qmode_line) ? MODE_LINE_FACE_ID
+    : EQ (face, Qmode_line_inactive) ? MODE_LINE_INACTIVE_FACE_ID
+    : EQ (face, Qheader_line) ? HEADER_LINE_FACE_ID
+    : EQ (face, Qtool_bar) ? TOOL_BAR_FACE_ID
+    : DEFAULT_FACE_ID;
 
   if (XBUFFER (buffer) != current_buffer)
     old_buffer = current_buffer;
diff --git a/src/xterm.c b/src/xterm.c
index e91782395df..f0ef8746b01 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8612,9 +8612,13 @@ x_check_fullscreen (struct frame *f)
   if (f->output_data.x->parent_desc != FRAME_X_DISPLAY_INFO (f)->root_window)
     return; /* Only fullscreen without WM or with EWM hints (above). */
 
+  /* Setting fullscreen to nil doesn't do anything.  We could save the
+     last non-fullscreen size and restore it, but it seems like a
+     lot of work for this unusual case (no window manager running).  */
+
   if (f->want_fullscreen != FULLSCREEN_NONE)
     {
-      int width = FRAME_COLS (f), height = FRAME_LINES (f);
+      int width = FRAME_PIXEL_WIDTH (f), height = FRAME_PIXEL_HEIGHT (f);
       struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
 
       switch (f->want_fullscreen)
@@ -8632,12 +8636,8 @@ x_check_fullscreen (struct frame *f)
           height = x_display_pixel_height (dpyinfo);
         }
 
-      if (FRAME_COLS (f) != width || FRAME_LINES (f) != height)
-        {
-          change_frame_size (f, height, width, 0, 1, 0);
-          SET_FRAME_GARBAGED (f);
-          cancel_mouse_face (f);
-        }
+      XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
+                     width, height);
     }
 }