Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-160
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-161
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-162
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-163
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-164
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-165
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-166
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-167
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-168
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-169
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-170
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-171
   Update from CVS: man/mh-e.texi (Folders): Various edits.

 * emacs@sv.gnu.org/emacs--devo--0--patch-172
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-58
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-59
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-60
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-61
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-62
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-63
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-64
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-534

18 files changed, 536 insertions, 83 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f6edc410276..867306579ab 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,141 @@
+2006-03-21  Ken Raeburn  <raeburn@raeburn.org>
+
+        * xdisp.c (store_next_glyph): Renamed from append_glyph.
+        (generate_stretch_glyph): Renamed from produce_stretch_glyph.
+        All callers changed accordingly.
+
+2006-03-21  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c: x_session_initialized new variable.
+        (x_term_init): Use x_session_initialized to check if
+        x_session_initialize should be called.
+        (x_initialize): Initialize x_session_initialized.
+
+2006-03-21  Kim F. Storm  <storm@cua.dk>
+
+        * fringe.c (draw_fringe_bitmap): Don't calculate default overlay arrow
+        bitmap here, but ...
+        (update_window_fringes): ... here, so we can test if it has changed.
+
+2006-03-20  Andreas Schwab  <schwab@suse.de>
+
+        * dispnew.c (init_display): Check DISPLAY here.
+
+        * emacs.c (main): Don't check here.
+
+        * xterm.c (x_display_ok): Don't use DISPLAY env var.
+
+2006-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.c (window_scroll_pixel_based): Yet another int/Lisp_Object
+        mixup (YAILOM).
+
+2006-03-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * emacs.c (main): Fix last change.
+
+2006-03-20  Kenichi Handa  <handa@m17n.org>
+
+        * fileio.c (Fwrite_region): Set visit_file to Qnil before GCPRO it.
+
+        * keymap.c (map_keymap): Set tail to Qnil before GCPRO it.
+
+        * xfns.c (xg_set_icon): Remove unnecessary GCPRO.
+
+        * xterm.c (x_term_init): Remove unnecessary GCPRO.
+
+2006-03-19  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (set_cursor_from_row): Fix cursor property on overlay string,
+        so it doesn't associate overlay string with following glyph by default.
+        Allow integer property value to specify explicit number of buffer
+        positions associate with overlay string.
+
+2006-03-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xterm.c (x_display_ok): Fix minor bug and compilation warnings.
+
+2006-03-18  Nozomu Ando  <nand@mac.com>
+
+        * m/pmax.h (BROKEN_NOCOMBRELOC) [__NetBSD__]: Define.
+        (LIB_STANDARD, START_FILES) [__NetBSD__]: Don't define.
+        (START_FILES, RUN_TIME_REMAP, UNEXEC) [__NetBSD__, __OpenBSD__]:
+        Don't redefine.
+
+        * m/mips.h: Don't use unexmips on NetBSD.
+        (LIBS_MACHINE): Move definition lower, so it doesn't use
+        LD_SWITCH_MACHINE, START_FILES, LIB_STANDARD, LIBS_TERMCAP,
+        C_SWITCH_MACHINE, and C_DEBUG_SWITCH.
+
+        * unexelf.c [BROKEN_NOCOMBRELOC]: Include assert.h.
+        (unexec) [BROKEN_NOCOMBRELOC]: Handle platforms whose nocombreloc
+        option is broken (e.g., MIPS/NetBSD).
+
+2006-03-18  Craig McDaniel  <craigmcd@gmail.com>  (tiny change)
+
+        * sheap.c (STATIC_HEAP_SIZE): Enlarge STATIC_HEAP_SIZE to 12MB.
+        Remove the HAVE_X_WINDOWS conditional.
+
+2006-03-18  Vivek Dasmohapatra  <vivek@etla.org>  (tiny change)
+
+        * emacs.c (main): If user asks for a display that is unavailable,
+        simulate -nw.
+
+        * xterm.c (x_display_ok): New function.
+
+        * xterm.h: Add prototype for x_display_ok.
+
+2006-03-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (Fw32_select_font): Doc fix.
+
+2006-03-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * image.c [MAC_OS] (XPutPixel, XGetPixel)
+        [!WORDS_BIG_ENDIAN && USE_CG_DRAWING]: Don't use specialized
+        version when depth is 32.
+        (mac_create_cg_image_from_image) [MAC_OS && USE_CG_DRAWING]:
+        New function.
+        (prepare_image_for_display) [MAC_OS && USE_CG_DRAWING]: Use it.
+        (x_clear_image_1) [MAC_OS && USE_CG_DRAWING]: Release CGImage.
+
+        * macterm.c (XCreatePixmap) [!WORDS_BIG_ENDIAN && USE_CG_DRAWING]:
+        Create GWorld in ARGB pixel format.
+        (mac_copy_area, mac_copy_area_with_mask) [USE_CG_DRAWING]:
+        Remove functions.
+        (x_draw_image_foreground) [USE_CG_DRAWING]: Use mac_draw_cg_image
+        instead of mac_copy_area/mac_copy_area_with_mask.
+
+2006-03-15  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (extend_face_to_end_of_line): Always add space glyph to
+        empty row.  Fixes memory corruption revealed by 2006-03-02 change.
+        (display_tool_bar_line): Skip empty tool-bar line if HEIGHT < 0.
+        (tool_bar_lines_needed): Fix tool-bar display in case the tool-bar
+        width is exactly the same as the window width.  Don't count a final
+        empty tool-bar line (pass HEIGHT = -1 to display_tool_bar_line).
+
+2006-03-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * fringe.c (w32_init_fringe, w32_reset_fringes): Revert to being
+        conditional on HAVE_NTGUI, not WINDOWS_NT.
+
+2006-03-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * dispextern.h (mac_init_fringe) [MAC_OS]: Add prototype.
+
+        * fringe.c (mac_init_fringe) [MAC_OS]: New function.
+
+        * macterm.c (mac_initialize) [USE_CG_DRAWING]: Call mac_init_fringe.
+        (max_fringe_bmp, fringe_bmp) [USE_CG_DRAWING]: New variables.
+        (mac_define_fringe_bitmap, mac_destroy_fringe_bitmap)
+        (mac_draw_cg_image) [USE_CG_DRAWING]: New functions.
+        (mac_draw_bitmap) [USE_CG_DRAWING]: Remove function.
+        (x_draw_fringe_bitmap) [USE_CG_DRAWING]: Use mac_draw_cg_image
+        instead of mac_draw_bitmap.
+        (x_redisplay_interface) [USE_CG_DRAWING]: Set handlers for
+        define_fringe_bitmap and destroy_fringe_bitmap.
+
 2006-03-14  Chong Yidong  <cyd@stupidchicken.com>
 
         * xterm.c (x_uncatch_errors): Block input for entire function.
@@ -5,7 +143,7 @@
 2006-03-12  Jason Rumney  <jasonr@gnu.org>
 
         * w32fns.c (Fx_create_frame): Remove call to
-        Qface_set_after_frame_default. (from xfns.c 2003-05-26)
+        Qface_set_after_frame_default (from xfns.c 2003-05-26).
 
         * w32menu.c (Fx_popup_menu): Call w32_free_menu_strings when
         finished with the menu.
@@ -15,7 +153,7 @@
         (note_mouse_movement): Say mouse moved if current frame differs
         from last_mouse_glyph_frame, and update last_mouse_glyph_frame.
         (w32_mouse_position): Set last_mouse_glyph_frame.
-         Remove OLD_REDISPLAY_CODE block.
+        Remove OLD_REDISPLAY_CODE block.
 
 2006-03-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
@@ -68,8 +206,7 @@
 
 2006-03-11  David Ponce  <david@dponce.com>
 
-        * xfns.c (x_create_tip_frame): Preserve received parms by copying
-        them.
+        * xfns.c (x_create_tip_frame): Preserve received parms by copying them.
 
 2006-03-11  Eli Zaretskii  <eliz@gnu.org>
 
@@ -90,14 +227,14 @@
         * keymap.c (describe_map): Shorten string to indicate shadowed binding.
 
         * vm-limit.c (get_lim_data, lim_data, data_space_start):
-        Moved from mem-limits.h.
+        Move from mem-limits.h.
         (enum warnlevel): New data type.
         (check_memory_limits): Rewrite the logic about warnings.
         Use standard `struct rlimit'.  Check return values for nonsense.
         (memory_warnings): Always clear lim_data.
 
         * mem-limits.h (get_lim_data, lim_data, data_space_start):
-        Moved to vm-limit.c.
+        Move to vm-limit.c.
 
         * xterm.c (x_fully_uncatch_errors, x_catching_errors): New functions.
 
@@ -193,7 +330,7 @@
 
         * xdisp.c: Minimize the unpleasent visual impact of the requirement
         that non-toolkit tool-bars must occupy an integral number of screen
-        lines, by distributing the rows evenly over the tool-bar screen area.
+        lines, by distributing the rows evenly over the tool-bar screen area.
         (Vtool_bar_border): New variable.
         (syms_of_xdisp): DEFVAR_LISP it.
         (display_tool_bar_line): Add HEIGHT arg for desired row height.
@@ -227,9 +364,9 @@
 
         * xterm.h, xterm.c (x_uncatch_errors): Delete unneccessary argument.
 
-        * xterm.c: (x_load_font, x_term_init, XTmouse_position)
-        (handle_one_xevent, x_connection_closed, x_list_fonts): No arg for
-        x_uncatch_errors.
+        * xterm.c (x_load_font, x_term_init, XTmouse_position)
+        (handle_one_xevent, x_connection_closed, x_list_fonts):
+        No arg for x_uncatch_errors.
 
         * xselect.c (x_own_selection, x_decline_selection_request)
         (x_reply_selection_request, x_get_foreign_selection)
@@ -357,7 +494,7 @@
 
         * fringe.c (syms_of_fringe) <fringe-bitmaps>: Doc fix.
 
-2006-02-21  Zhang Wei <brep@newsmth.org>
+2006-02-21  Zhang Wei  <brep@newsmth.org>
 
         * xfns.c (Fx_file_dialog, Motif and GTK): DECODE_FILE before
         returning it.
@@ -426,7 +563,7 @@
         (draw_fringe_bitmap_1): Make static.
         (get_logical_cursor_bitmap, get_logical_fringe_bitmap): New functions
         to map from logical cursors and indicators to physical bitmaps.
-        (draw_fringe_bitmap): Resolve fringe cursor and overlay-arrow
+        (draw_fringe_bitmap): Resolve fringe cursor and overlay-arrow
         bitmaps using symbol names instead of bitmap numbers.
         (update_window_fringes): Use logical indicator symbol names
         instead of bitmap numbers for logical.  Add bitmap cache.
diff --git a/src/dispextern.h b/src/dispextern.h
index 66ec02d724a..157f49dea6d 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2722,6 +2722,9 @@ void compute_fringe_widths P_ ((struct frame *, int));
 void w32_init_fringe P_ ((void));
 void w32_reset_fringes P_ ((void));
 #endif
+#ifdef MAC_OS
+void mac_init_fringe P_ ((void));
+#endif
 
 /* Defined in image.c */
 
diff --git a/src/dispnew.c b/src/dispnew.c
index 5f3c8eacc3d..296dbece477 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6705,6 +6705,13 @@ init_display ()
 #endif
 
       display_arg = (display != 0 && *display != 0);
+
+      if (display_arg && !x_display_ok (display))
+        {
+          fprintf (stderr, "Display %s unavailable, simulating -nw\n",
+                   display);
+          inhibit_window_system = 1;
+        }
     }
 
   if (!inhibit_window_system && display_arg
diff --git a/src/fileio.c b/src/fileio.c
index e27f87bcbcf..2248963102a 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5011,6 +5011,7 @@ This does code conversion according to the value of
   if (!NILP (start) && !STRINGP (start))
     validate_region (&start, &end);
 
+  visit_file = Qnil;
   GCPRO5 (start, filename, visit, visit_file, lockname);
 
   filename = Fexpand_file_name (filename, Qnil);
diff --git a/src/fringe.c b/src/fringe.c
index 721b572e373..4b8ac34fe09 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -867,10 +867,7 @@ draw_fringe_bitmap (w, row, left_p)
   draw_fringe_bitmap_1 (w, row, left_p, overlay, NO_FRINGE_BITMAP);
 
   if (left_p && row->overlay_arrow_bitmap != NO_FRINGE_BITMAP)
-    draw_fringe_bitmap_1 (w, row, 1, 1,
-                          (row->overlay_arrow_bitmap < 0
-                           ? get_logical_fringe_bitmap (w, Qoverlay_arrow, 0, 0)
-                           : row->overlay_arrow_bitmap));
+    draw_fringe_bitmap_1 (w, row, 1, 1, row->overlay_arrow_bitmap);
 }
 
 
@@ -1152,6 +1149,9 @@ update_window_fringes (w, keep_current_p)
             }
         }
 
+      if (row->overlay_arrow_bitmap < 0)
+        row->overlay_arrow_bitmap = get_logical_fringe_bitmap (w, Qoverlay_arrow, 0, 0);
+
       if (row->overlay_arrow_bitmap != cur->overlay_arrow_bitmap)
         {
           redraw_p = row->redraw_fringe_bitmaps_p = cur->redraw_fringe_bitmaps_p = 1;
@@ -1695,10 +1695,14 @@ init_fringe ()
     }
 }
 
-#ifdef HAVE_NTGUI
+#if defined (HAVE_NTGUI) || defined (MAC_OS)
 
 void
+#ifdef HAVE_NTGUI
 w32_init_fringe ()
+#else  /* MAC_OS */
+mac_init_fringe ()
+#endif
 {
   int bt;
 
@@ -1711,7 +1715,9 @@ w32_init_fringe ()
       rif->define_fringe_bitmap (bt, fb->bits, fb->height, fb->width);
     }
 }
+#endif
 
+#ifdef HAVE_NTGUI
 void
 w32_reset_fringes ()
 {
diff --git a/src/image.c b/src/image.c
index ba78a835ef3..8e3a0afe91a 100644
--- a/src/image.c
+++ b/src/image.c
@@ -189,6 +189,7 @@ XPutPixel (ximage, x, y, pixel)
   PixMapHandle pixmap = GetGWorldPixMap (ximage);
   short depth = GetPixDepth (pixmap);
 
+#if defined (WORDS_BIG_ENDIAN) || !USE_CG_DRAWING
   if (depth == 32)
     {
       char *base_addr = GetPixBaseAddr (pixmap);
@@ -196,7 +197,9 @@ XPutPixel (ximage, x, y, pixel)
 
       ((unsigned long *) (base_addr + y * row_bytes))[x] = 0xff000000 | pixel;
     }
-  else if (depth == 1)
+  else
+#endif
+ if (depth == 1)
     {
       char *base_addr = GetPixBaseAddr (pixmap);
       short row_bytes = GetPixRowBytes (pixmap);
@@ -233,6 +236,7 @@ XGetPixel (ximage, x, y)
   PixMapHandle pixmap = GetGWorldPixMap (ximage);
   short depth = GetPixDepth (pixmap);
 
+#if defined (WORDS_BIG_ENDIAN) || !USE_CG_DRAWING
   if (depth == 32)
     {
       char *base_addr = GetPixBaseAddr (pixmap);
@@ -240,7 +244,9 @@ XGetPixel (ximage, x, y)
 
       return ((unsigned long *) (base_addr + y * row_bytes))[x] & 0x00ffffff;
     }
-  else if (depth == 1)
+  else
+#endif
+  if (depth == 1)
     {
       char *base_addr = GetPixBaseAddr (pixmap);
       short row_bytes = GetPixRowBytes (pixmap);
@@ -272,6 +278,49 @@ XDestroyImage (ximg)
 {
   UnlockPixels (GetGWorldPixMap (ximg));
 }
+
+#if USE_CG_DRAWING
+static CGImageRef
+mac_create_cg_image_from_image (f, img)
+     struct frame *f;
+     struct image *img;
+{
+  Pixmap mask;
+  CGImageRef result = NULL;
+
+  BLOCK_INPUT;
+  if (img->mask)
+    mask = img->mask;
+  else
+    {
+      mask = XCreatePixmap (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+                            img->width, img->height, 1);
+      if (mask)
+        {
+          CGrafPtr old_port;
+          GDHandle old_gdh;
+          Rect r;
+
+          GetGWorld (&old_port, &old_gdh);
+          SetGWorld (mask, NULL);
+          BackColor (blackColor); /* Don't mask.  */
+          SetRect (&r, 0, 0, img->width, img->height);
+          EraseRect (&r);
+          SetGWorld (old_port, old_gdh);
+        }
+    }
+  if (mask)
+    {
+      CreateCGImageFromPixMaps (GetGWorldPixMap (img->pixmap),
+                                GetGWorldPixMap (mask), &result);
+      if (mask != img->mask)
+        XFreePixmap (FRAME_X_DISPLAY (f), mask);
+    }
+  UNBLOCK_INPUT;
+
+  return result;
+}
+#endif /* USE_CG_DRAWING */
 #endif /* MAC_OS */
 
 
@@ -1206,6 +1255,18 @@ prepare_image_for_display (f, img)
      type dependent loader function.  */
   if (img->pixmap == NO_PIXMAP && !img->load_failed_p)
     img->load_failed_p = img->type->load (f, img) == 0;
+
+#if defined (MAC_OS) && USE_CG_DRAWING
+  if (!img->load_failed_p && img->data.ptr_val == NULL)
+    {
+      img->data.ptr_val = mac_create_cg_image_from_image (f, img);
+      if (img->data.ptr_val == NULL)
+        {
+          img->load_failed_p = 1;
+          img->type->free (f, img);
+        }
+    }
+#endif
 }
 
 
@@ -1452,6 +1513,14 @@ x_clear_image_1 (f, img, pixmap_p, mask_p, colors_p)
       img->colors = NULL;
       img->ncolors = 0;
     }
+
+#if defined (MAC_OS) && USE_CG_DRAWING
+  if (img->data.ptr_val)
+    {
+      CGImageRelease (img->data.ptr_val);
+      img->data.ptr_val = NULL;
+    }
+#endif
 }
 
 /* Free X resources of image IMG which is used on frame F.  */
diff --git a/src/keymap.c b/src/keymap.c
index fc7b23f6302..92c67ed1f1a 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -692,6 +692,7 @@ map_keymap (map, fun, args, data, autoload)
   struct gcpro gcpro1, gcpro2, gcpro3;
   Lisp_Object tail;
 
+  tail = Qnil;
   GCPRO3 (map, args, tail);
   map = get_keymap (map, 1, autoload);
   for (tail = (CONSP (map) && EQ (Qkeymap, XCAR (map))) ? XCDR (map) : map;
diff --git a/src/m/mips.h b/src/m/mips.h
index dc45a99d06b..9ae74178143 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -112,10 +112,10 @@ NOTE-END  */
 /* This machine requires completely different unexec code
    which lives in a separate file.  Specify the file name.  */
 
-#ifndef __linux__
+#if !defined(__linux__) && !defined(__NetBSD__)
 #undef UNEXEC
 #define UNEXEC unexmips.o
-#endif /* not __linux__ */
+#endif /* not __linux__ && not __NetBSD__ */
 
 /* Describe layout of the address space in an executing process.  */
 
@@ -142,14 +142,6 @@ NOTE-END  */
 #if defined (__NetBSD__) || defined (__OpenBSD__)
 #else  /* bsd with elf */
 #define LINKER /bsd43/bin/ld
-#endif /* bsd with elf */
-#else /* not BSD_SYSTEM */
-
-#if defined(__GNUC__) && defined(_ABIN32)
-#define LIBS_MACHINE
-#else
-#define LIBS_MACHINE -lmld
-#endif
 
 #define LD_SWITCH_MACHINE -D 800000 -g3
 #define START_FILES pre-crt0.o /usr/lib/crt1.o
@@ -159,6 +151,15 @@ NOTE-END  */
 #define C_SWITCH_MACHINE -I/usr/include/bsd
 #define C_DEBUG_SWITCH -O -g3
 
+#endif /* bsd with elf */
+#else /* not BSD_SYSTEM */
+
+#if defined(__GNUC__) && defined(_ABIN32)
+#define LIBS_MACHINE
+#else
+#define LIBS_MACHINE -lmld
+#endif
+
 #endif /* not BSD_SYSTEM */
 #endif /* not NEWSOS5 && not __linux__ */
 
diff --git a/src/m/pmax.h b/src/m/pmax.h
index 911f84d3c8a..c83c514ab98 100644
--- a/src/m/pmax.h
+++ b/src/m/pmax.h
@@ -13,8 +13,12 @@ NOTE-END  */
 #ifndef __MIPSEB__
 #undef WORDS_BIG_ENDIAN
 #endif
+#if defined (__NetBSD__)
+#define BROKEN_NOCOMBRELOC
+#else
 #undef LIB_STANDARD
 #undef START_FILES
+#endif
 #undef COFF
 #undef TERMINFO
 #define MAIL_USE_FLOCK
@@ -24,18 +28,12 @@ NOTE-END  */
 #ifdef MACH
 #define START_FILES pre-crt0.o /usr/lib/crt0.o
 #else
+#if !defined (__NetBSD__)
 /* This line starts being needed with ultrix 4.0.  */
 /* You must delete it for version 3.1.  */
 #define START_FILES pre-crt0.o /usr/lib/cmplrs/cc/crt0.o
 #endif
-
-#if defined (__NetBSD__) || defined (__OpenBSD__)
-#undef START_FILES
-#define START_FILES pre-crt0.o /usr/lib/crt0.o
-#undef RUN_TIME_REMAP
-#undef UNEXEC
-#define UNEXEC unexelf.o
-#endif /* NetBSD || OpenBSD */
+#endif
 
 /* Supposedly the following will overcome a kernel bug.  */
 #undef LD_SWITCH_MACHINE
diff --git a/src/macterm.c b/src/macterm.c
index d3510dbf516..a51304f21da 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -281,6 +281,11 @@ extern void menubar_selection_callback (FRAME_PTR, int);
 #if USE_CG_DRAWING
 #define FRAME_CG_CONTEXT(f)     ((f)->output_data.mac->cg_context)
 
+/* Fringe bitmaps.  */
+
+static int max_fringe_bmp = 0;
+static CGImageRef *fringe_bmp = 0;
+
 static CGContextRef
 mac_begin_cg_clip (f, gc)
      struct frame *f;
@@ -509,6 +514,44 @@ mac_clear_window (f)
 
 /* Mac replacement for XCopyArea.  */
 
+#if USE_CG_DRAWING
+static void
+mac_draw_cg_image (image, f, gc, src_x, src_y, width, height,
+                   dest_x, dest_y, overlay_p)
+     CGImageRef image;
+     struct frame *f;
+     GC gc;
+     int src_x, src_y;
+     unsigned int width, height;
+     int dest_x, dest_y, overlay_p;
+{
+  CGContextRef context;
+  float port_height = FRAME_PIXEL_HEIGHT (f);
+  CGRect dest_rect = CGRectMake (dest_x, dest_y, width, height);
+
+  context = mac_begin_cg_clip (f, gc);
+  if (!overlay_p)
+    {
+      CG_SET_FILL_COLOR (context, gc->xgcv.background);
+      CGContextFillRect (context, dest_rect);
+    }
+  CGContextClipToRect (context, dest_rect);
+  CGContextScaleCTM (context, 1, -1);
+  CGContextTranslateCTM (context, 0, -port_height);
+  if (CGImageIsMask (image))
+    CG_SET_FILL_COLOR (context, gc->xgcv.foreground);
+  CGContextDrawImage (context,
+                      CGRectMake (dest_x - src_x,
+                                  port_height - (dest_y - src_y
+                                                 + CGImageGetHeight (image)),
+                                  CGImageGetWidth (image),
+                                  CGImageGetHeight (image)),
+                      image);
+  mac_end_cg_clip (f);
+}
+
+#else  /* !USE_CG_DRAWING */
+
 static void
 mac_draw_bitmap (f, gc, x, y, width, height, bits, overlay_p)
      struct frame *f;
@@ -524,9 +567,6 @@ mac_draw_bitmap (f, gc, x, y, width, height, bits, overlay_p)
   bitmap.baseAddr = (char *)bits;
   SetRect (&(bitmap.bounds), 0, 0, width, height);
 
-#if USE_CG_DRAWING
-  mac_prepare_for_quickdraw (f);
-#endif
   SetPortWindowPort (FRAME_MAC_WINDOW (f));
 
   RGBForeColor (GC_FORE_COLOR (gc));
@@ -552,6 +592,7 @@ mac_draw_bitmap (f, gc, x, y, width, height, bits, overlay_p)
 
   RGBBackColor (GC_BACK_COLOR (FRAME_NORMAL_GC (f)));
 }
+#endif  /* !USE_CG_DRAWING */
 
 
 /* Mac replacement for XCreateBitmapFromBitmapData.  */
@@ -612,7 +653,15 @@ XCreatePixmap (display, w, width, height, depth)
   SetPortWindowPort (w);
 
   SetRect (&r, 0, 0, width, height);
-  err = NewGWorld (&pixmap, depth, &r, NULL, NULL, 0);
+#if !defined (WORDS_BIG_ENDIAN) && USE_CG_DRAWING
+  if (depth == 1)
+#endif
+    err = NewGWorld (&pixmap, depth, &r, NULL, NULL, 0);
+#if !defined (WORDS_BIG_ENDIAN) && USE_CG_DRAWING
+  else
+    /* CreateCGImageFromPixMaps requires ARGB format.  */
+    err = QTNewGWorld (&pixmap, k32ARGBPixelFormat, &r, NULL, NULL, 0);
+#endif
   if (err != noErr)
     return NULL;
   return pixmap;
@@ -1295,6 +1344,7 @@ mac_draw_image_string_cg (f, gc, x, y, buf, nchars, bg_width)
 #endif
 
 
+#if !USE_CG_DRAWING
 /* Mac replacement for XCopyArea: dest must be window.  */
 
 static void
@@ -1308,9 +1358,6 @@ mac_copy_area (src, f, gc, src_x, src_y, width, height, dest_x, dest_y)
 {
   Rect src_r, dest_r;
 
-#if USE_CG_DRAWING
-  mac_prepare_for_quickdraw (f);
-#endif
   SetPortWindowPort (FRAME_MAC_WINDOW (f));
 
   SetRect (&src_r, src_x, src_y, src_x + width, src_y + height);
@@ -1355,9 +1402,6 @@ mac_copy_area_with_mask (src, mask, f, gc, src_x, src_y,
 {
   Rect src_r, dest_r;
 
-#if USE_CG_DRAWING
-  mac_prepare_for_quickdraw (f);
-#endif
   SetPortWindowPort (FRAME_MAC_WINDOW (f));
 
   SetRect (&src_r, src_x, src_y, src_x + width, src_y + height);
@@ -1390,6 +1434,7 @@ mac_copy_area_with_mask (src, mask, f, gc, src_x, src_y,
 
   RGBBackColor (GC_BACK_COLOR (FRAME_NORMAL_GC (f)));
 }
+#endif  /* !USE_CG_DRAWING */
 
 
 /* Mac replacement for XCopyArea: used only for scrolling.  */
@@ -2001,9 +2046,12 @@ x_draw_fringe_bitmap (w, row, p)
 #endif
     }
 
-  if (p->which)
+  if (p->which
+#if USE_CG_DRAWING
+      && p->which < max_fringe_bmp
+#endif
+      )
     {
-      unsigned short *bits = p->bits + p->dh;
       XGCValues gcv;
 
       XGetGCValues (display, face->gc, GCForeground, &gcv);
@@ -2012,14 +2060,64 @@ x_draw_fringe_bitmap (w, row, p)
                        ? (p->overlay_p ? face->background
                           : f->output_data.mac->cursor_pixel)
                        : face->foreground));
+#if USE_CG_DRAWING
+      mac_draw_cg_image (fringe_bmp[p->which], f, face->gc, 0, p->dh,
+                         p->wd, p->h, p->x, p->y, p->overlay_p);
+#else
       mac_draw_bitmap (f, face->gc, p->x, p->y,
-                       p->wd, p->h, bits, p->overlay_p);
+                       p->wd, p->h, p->bits + p->dh, p->overlay_p);
+#endif
       XSetForeground (display, face->gc, gcv.foreground);
     }
 
   mac_reset_clip_rectangles (display, face->gc);
 }
 
+#if USE_CG_DRAWING
+static void
+mac_define_fringe_bitmap (which, bits, h, wd)
+     int which;
+     unsigned short *bits;
+     int h, wd;
+{
+  unsigned short *mask_bits;
+  int i;
+  CGDataProviderRef provider;
+
+  if (which >= max_fringe_bmp)
+    {
+      i = max_fringe_bmp;
+      max_fringe_bmp = which + 20;
+      fringe_bmp = (CGImageRef *) xrealloc (fringe_bmp, max_fringe_bmp * sizeof (CGImageRef));
+      while (i < max_fringe_bmp)
+        fringe_bmp[i++] = 0;
+    }
+
+  for (i = 0; i < h; i++)
+    bits[i] = ~bits[i];
+  provider = CGDataProviderCreateWithData (NULL, bits,
+                                           sizeof (unsigned short) * h, NULL);
+  if (provider)
+    {
+      fringe_bmp[which] = CGImageMaskCreate (wd, h, 1, 1,
+                                             sizeof (unsigned short),
+                                             provider, NULL, 0);
+      CGDataProviderRelease (provider);
+    }
+}
+
+static void
+mac_destroy_fringe_bitmap (which)
+     int which;
+{
+  if (which >= max_fringe_bmp)
+    return;
+
+  if (fringe_bmp[which])
+    CGImageRelease (fringe_bmp[which]);
+  fringe_bmp[which] = 0;
+}
+#endif
 
 
 /* This is called when starting Emacs and when restarting after
@@ -3191,15 +3289,26 @@ x_draw_image_foreground (s)
     {
       x_set_glyph_string_clipping (s);
 
+#if USE_CG_DRAWING
+      mac_draw_cg_image (s->img->data.ptr_val,
+                         s->f, s->gc, s->slice.x, s->slice.y,
+                         s->slice.width, s->slice.height, x, y, 1);
+#endif
       if (s->img->mask)
+#if !USE_CG_DRAWING
         mac_copy_area_with_mask (s->img->pixmap, s->img->mask,
                                  s->f, s->gc, s->slice.x, s->slice.y,
                                  s->slice.width, s->slice.height, x, y);
+#else
+        ;
+#endif
       else
         {
+#if !USE_CG_DRAWING
           mac_copy_area (s->img->pixmap,
                          s->f, s->gc, s->slice.x, s->slice.y,
                          s->slice.width, s->slice.height, x, y);
+#endif
 
           /* When the image has a mask, we can expect that at
              least part of a mouse highlight or a block cursor will
@@ -10892,8 +11001,13 @@ static struct redisplay_interface x_redisplay_interface =
   x_get_glyph_overhangs,
   x_fix_overlapping_area,
   x_draw_fringe_bitmap,
+#if USE_CG_DRAWING
+  mac_define_fringe_bitmap,
+  mac_destroy_fringe_bitmap,
+#else
   0, /* define_fringe_bitmap */
   0, /* destroy_fringe_bitmap */
+#endif
   mac_per_char_metric,
   mac_encode_char,
   mac_compute_glyph_string_overhangs,
@@ -10970,6 +11084,11 @@ mac_initialize ()
     MakeMeTheFrontProcess ();
 #endif
 #endif
+
+#if USE_CG_DRAWING
+  mac_init_fringe ();
+#endif
+
   UNBLOCK_INPUT;
 }
 
diff --git a/src/sheap.c b/src/sheap.c
index 192af4030c6..03da2afa813 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -26,11 +26,7 @@ Boston, MA 02110-1301, USA.  */
 
 #include <unistd.h>
 
-#ifdef HAVE_X_WINDOWS
-#define STATIC_HEAP_SIZE        (8 * 1024 * 1024)
-#else
-#define STATIC_HEAP_SIZE        (8 * 1024 * 1024)
-#endif
+#define STATIC_HEAP_SIZE        (12 * 1024 * 1024)
 
 int debug_sheap = 0;
 
diff --git a/src/unexelf.c b/src/unexelf.c
index 30a35372544..a236b98eab1 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -433,6 +433,9 @@ extern void fatal (const char *msgid, ...);
 #if __sgi
 #include <syms.h> /* for HDRR declaration */
 #endif /* __sgi */
+#ifdef BROKEN_NOCOMBRELOC
+#include <assert.h>
+#endif
 
 #ifndef MAP_ANON
 #ifdef MAP_ANONYMOUS
@@ -687,6 +690,9 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
   int old_mdebug_index;
   struct stat stat_buf;
   int old_file_size;
+#ifdef BROKEN_NOCOMBRELOC
+  int unreloc_sections[10], n_unreloc_sections;
+#endif
 
   /* Open the old file, allocate a buffer of the right size, and read
      in the file contents.  */
@@ -1218,6 +1224,7 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
 
   /* This loop seeks out relocation sections for the data section, so
      that it can undo relocations performed by the runtime linker.  */
+#ifndef BROKEN_NOCOMBRELOC
   for (n = new_file_h->e_shnum - 1; n; n--)
     {
       ElfW(Shdr) section = NEW_SECTION_H (n);
@@ -1272,6 +1279,81 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
           break;
         }
     }
+#else /* BROKEN_NOCOMBRELOC */
+  for (n = 1, n_unreloc_sections = 0; n < new_file_h->e_shnum; n++)
+    if (!strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".data")
+        || !strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".sdata")
+        || !strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".lit4")
+        || !strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".lit8")
+#ifdef IRIX6_5                  /* see above */
+        || !strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".got")
+#endif
+        || !strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".sdata1")
+        || !strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".data1"))
+      {
+        assert (n_unreloc_sections
+                < (sizeof (unreloc_sections) / sizeof (unreloc_sections[0])));
+        unreloc_sections[n_unreloc_sections++] = n;
+#ifdef DEBUG
+        fprintf (stderr, "section %d: %s\n", n,
+                 old_section_names + NEW_SECTION_H (n).sh_name);
+#endif
+      }
+
+  for (n = new_file_h->e_shnum - 1; n; n--)
+    {
+      ElfW(Shdr) section = NEW_SECTION_H (n);
+      caddr_t reloc, end;
+      ElfW(Addr) addr, offset;
+      int target;
+
+      switch (section.sh_type)
+        {
+        default:
+          break;
+        case SHT_REL:
+        case SHT_RELA:
+          /* This code handles two different size structs, but there should
+             be no harm in that provided that r_offset is always the first
+             member.  */
+          for (reloc = old_base + section.sh_offset,
+                 end = reloc + section.sh_size;
+               reloc < end;
+               reloc += section.sh_entsize)
+            {
+              addr = ((ElfW(Rel) *) reloc)->r_offset;
+#ifdef __alpha__
+              /* The Alpha ELF binutils currently have a bug that
+                 sometimes results in relocs that contain all
+                 zeroes.  Work around this for now...  */
+              if (addr == 0)
+                continue;
+#endif
+              for (nn = 0; nn < n_unreloc_sections; nn++)
+                {
+                  target = unreloc_sections[nn];
+                  if (NEW_SECTION_H (target).sh_addr <= addr
+                      && addr < (NEW_SECTION_H (target).sh_addr +
+                                 NEW_SECTION_H (target).sh_size))
+                    {
+                      offset = (NEW_SECTION_H (target).sh_addr -
+                                NEW_SECTION_H (target).sh_offset);
+                      memcpy (new_base + addr - offset,
+                              old_base + addr - offset,
+                              sizeof (ElfW(Addr)));
+#ifdef DEBUG
+                      fprintf (stderr, "unrelocate: [%08lx] <= %08lx\n",
+                               (long) addr,
+                               (long) *((long *) (new_base + addr - offset)));
+#endif
+                      break;
+                    }
+                }
+            }
+          break;
+        }
+    }
+#endif  /* BROKEN_NOCOMBRELOC */
 
   /* Write out new_file, and free the buffers.  */
 
diff --git a/src/w32fns.c b/src/w32fns.c
index 08b6ed8b1a4..55f4af03d6e 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7937,8 +7937,12 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
  ***********************************************************************/
 
 DEFUN ("w32-select-font", Fw32_select_font, Sw32_select_font, 0, 2, 0,
-       doc: /* Select a font using the W32 font dialog.
-Returns an X font string corresponding to the selection.  */)
+       doc: /* Select a font for the named FRAME using the W32 font dialog.
+Returns an X-style font string corresponding to the selection.
+
+If FRAME is omitted or nil, it defaults to the selected frame.
+If INCLUDE-PROPORTIONAL is non-nil, include proportional fonts
+in the font selection dialog. */)
   (frame, include_proportional)
      Lisp_Object frame, include_proportional;
 {
diff --git a/src/window.c b/src/window.c
index 23a4eb98e4b..cbfc7e02401 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4798,8 +4798,8 @@ window_scroll_pixel_based (window, n, whole, noerror)
          possibility of point becoming "stuck" on a tall line when
          scrolling by one line.  */
       if (window_scroll_pixel_based_preserve_y < 0
-          || (current_kboard->Vlast_command != Qscroll_up
-              && current_kboard->Vlast_command != Qscroll_down))
+          || (!EQ (current_kboard->Vlast_command, Qscroll_up)
+              && !EQ (current_kboard->Vlast_command, Qscroll_down)))
         {
           start_display (&it, w, start);
           move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
diff --git a/src/xdisp.c b/src/xdisp.c
index 7bdda29fb0f..b80d21ade80 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9443,7 +9443,12 @@ build_desired_tool_bar_string (f)
    HEIGHT specifies the desired height of the tool-bar line.
    If the actual height of the glyph row is less than HEIGHT, the
    row's height is increased to HEIGHT, and the icons are centered
-   vertically in the new height.  */
+   vertically in the new height.
+
+   If HEIGHT is -1, we are counting needed tool-bar lines, so don't
+   count a final empty row in case the tool-bar width exactly matches
+   the window width.
+*/
 
 static void
 display_tool_bar_line (it, height)
@@ -9467,7 +9472,12 @@ display_tool_bar_line (it, height)
 
       /* Get the next display element.  */
       if (!get_next_display_element (it))
-        break;
+        {
+          /* Don't count empty row if we are counting needed tool-bar lines.  */
+          if (height < 0 && !it->hpos)
+            return;
+          break;
+        }
 
       /* Produce glyphs.  */
       x_before = it->current_x;
@@ -9565,11 +9575,12 @@ tool_bar_lines_needed (f, n_rows)
     {
       it.glyph_row = w->desired_matrix->rows;
       clear_glyph_row (it.glyph_row);
-      display_tool_bar_line (&it, 0);
+      display_tool_bar_line (&it, -1);
     }
 
+  /* f->n_tool_bar_rows == 0 means "unknown"; -1 means no tool-bar.  */
   if (n_rows)
-    *n_rows = it.vpos;
+    *n_rows = it.vpos > 0 ? it.vpos : -1;
 
   return (it.current_y + FRAME_LINE_HEIGHT (f) - 1) / FRAME_LINE_HEIGHT (f);
 }
@@ -9645,11 +9656,7 @@ redisplay_tool_bar (f)
   reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1);
 
   if (f->n_tool_bar_rows == 0)
-    {
-      (void)tool_bar_lines_needed (f, &f->n_tool_bar_rows);
-      if (f->n_tool_bar_rows == 0)
-        f->n_tool_bar_rows = -1;
-    }
+    (void)tool_bar_lines_needed (f, &f->n_tool_bar_rows);
 
   /* Display as many lines as needed to display all tool-bar items.  */
 
@@ -11607,7 +11614,7 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
           x += glyph->pixel_width;
           ++glyph;
           if (cursor_from_overlay_pos
-              && last_pos > cursor_from_overlay_pos)
+              && last_pos >= cursor_from_overlay_pos)
             {
               cursor_from_overlay_pos = 0;
               cursor = 0;
@@ -11621,10 +11628,12 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
           /* Skip all glyphs from string.  */
           do
             {
+              Lisp_Object cprop;
               int pos;
               if ((cursor == NULL || glyph > cursor)
-                  && !NILP (Fget_char_property (make_number ((glyph)->charpos),
-                                                Qcursor, (glyph)->object))
+                  && (cprop = Fget_char_property (make_number ((glyph)->charpos),
+                                                  Qcursor, (glyph)->object),
+                      !NILP (cprop))
                   && (pos = string_buffer_position (w, glyph->object,
                                                     string_before_pos),
                       (pos == 0   /* From overlay */
@@ -11635,14 +11644,15 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
                      Add 1 to last_pos so that if point corresponds to the
                      glyph right after the overlay, we still use a 'cursor'
                      property found in that overlay.  */
-                  cursor_from_overlay_pos = pos == 0 ? last_pos+1 : 0;
+                  cursor_from_overlay_pos = (pos ? 0 : last_pos
+                                             + (INTEGERP (cprop) ? XINT (cprop) : 0));
                   cursor = glyph;
                   cursor_x = x;
                 }
               x += glyph->pixel_width;
               ++glyph;
             }
-          while (glyph < end && STRINGP (glyph->object));
+          while (glyph < end && EQ (glyph->object, string_start->object));
         }
     }
 
@@ -15373,6 +15383,7 @@ extend_face_to_end_of_line (it)
     face = FACE_FROM_ID (f, it->face_id);
 
   if (FRAME_WINDOW_P (f)
+      && it->glyph_row->displays_text_p
       && face->box == FACE_NO_BOX
       && face->background == FRAME_BACKGROUND_PIXEL (f)
       && !face->stipple)
@@ -19390,7 +19401,7 @@ draw_glyphs (w, x, row, area, start, end, hl, overlaps)
    Called from x_produce_glyphs when IT->glyph_row is non-null.  */
 
 static INLINE void
-append_glyph (it)
+store_next_glyph (it)
      struct it *it;
 {
   struct glyph *glyph;
@@ -19714,7 +19725,7 @@ append_stretch_glyph (it, object, width, height, ascent)
    ASCENT must be in the range 0 <= ASCENT <= 100.  */
 
 static void
-produce_stretch_glyph (it)
+generate_stretch_glyph (it)
      struct it *it;
 {
   /* (space :width WIDTH :height HEIGHT ...)  */
@@ -20140,7 +20151,7 @@ x_produce_glyphs (it)
                                         it->ascent + it->descent, ascent);
                 }
               else
-                append_glyph (it);
+                store_next_glyph (it);
 
               /* If characters with lbearing or rbearing are displayed
                  in this line, record that fact in a flag of the
@@ -20322,7 +20333,7 @@ x_produce_glyphs (it)
           take_vertical_position_into_account (it);
 
           if (it->glyph_row)
-            append_glyph (it);
+            store_next_glyph (it);
         }
       it->multibyte_p = saved_multibyte_p;
     }
@@ -20602,7 +20613,7 @@ x_produce_glyphs (it)
   else if (it->what == IT_IMAGE)
     produce_image_glyph (it);
   else if (it->what == IT_STRETCH)
-    produce_stretch_glyph (it);
+    generate_stretch_glyph (it);
 
   /* Accumulate dimensions.  Note: can't assume that it->descent > 0
      because this isn't true for images with `:ascent 100'.  */
diff --git a/src/xfns.c b/src/xfns.c
index a350f6a7f90..6433f9172ab 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -799,12 +799,9 @@ xg_set_icon (f, file)
     FRAME_PTR f;
     Lisp_Object file;
 {
-  struct gcpro gcpro1;
   int result = 0;
   Lisp_Object found;
 
-  GCPRO1 (found);
-
   found = x_find_image_file (file);
 
   if (! NILP (found))
diff --git a/src/xterm.c b/src/xterm.c
index 378373fe791..c17a25cbd05 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10074,6 +10074,10 @@ static XrmOptionDescRec emacs_options[] = {
 
 static int x_initialized;
 
+#ifdef HAVE_X_SM
+static int x_session_initialized;
+#endif
+
 #ifdef MULTI_KBOARD
 /* Test whether two display-name strings agree up to the dot that separates
    the screen number from the server number.  */
@@ -10151,6 +10155,21 @@ get_bits_and_offset (mask, bits, offset)
   *bits = nr;
 }
 
+int
+x_display_ok (display)
+    const char * display;
+{
+    int dpy_ok = 1;
+    Display *dpy;
+
+    dpy = XOpenDisplay (display);
+    if (dpy)
+      XCloseDisplay (dpy);
+    else
+      dpy_ok = 0;
+    return dpy_ok;
+}
+
 struct x_display_info *
 x_term_init (display_name, xrm_option, resource_name)
      Lisp_Object display_name;
@@ -10233,11 +10252,9 @@ x_term_init (display_name, xrm_option, resource_name)
 
         /* Load our own gtkrc if it exists.  */
         {
-          struct gcpro gcpro1, gcpro2;
           char *file = "~/.emacs.d/gtkrc";
           Lisp_Object s, abs_file;
 
-          GCPRO2 (s, abs_file);
           s = make_string (file, strlen (file));
           abs_file = Fexpand_file_name (s, Qnil);
 
@@ -10899,6 +10916,9 @@ x_initialize ()
   last_tool_bar_item = -1;
   any_help_event_p = 0;
   ignore_next_mouse_click_timeout = 0;
+#ifdef HAVE_X_SM
+  x_session_initialized = 0;
+#endif
 
 #ifdef USE_GTK
   current_count = -1;
diff --git a/src/xterm.h b/src/xterm.h
index b581c0c0159..873b7da2b14 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -423,6 +423,7 @@ extern struct x_display_info *x_display_info_for_display P_ ((Display *));
 extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object));
 
 extern struct x_display_info *x_term_init P_ ((Lisp_Object, char *, char *));
+extern int x_display_ok  P_ ((const char *));
 
 extern Lisp_Object x_list_fonts P_ ((struct frame *, Lisp_Object, int, int));
 extern void select_visual P_ ((struct x_display_info *));