Merge from emacs-23; up to 2010-06-12T17:12:15Z!cyd@stupidchicken.com.

3 files changed, 20 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9b538fb4aa9..2ce41e3b35b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2011-06-04  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * emacs.c (main): Warn when starting a GTK emacs in daemon mode.
+
+2011-06-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * fringe.c (update_window_fringes): Don't update overlay arrow bitmap
+        in the current matrix if keep_current_p is non-zero.
+
 2011-06-04  Eli Zaretskii  <eliz@gnu.org>
 
         * bidi.c (bidi_level_of_next_char): Fix last change.
diff --git a/src/emacs.c b/src/emacs.c
index 70d90fd5781..d14acd63587 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1002,6 +1002,11 @@ main (int argc, char **argv)
         }
 
 #ifndef NS_IMPL_COCOA
+#ifdef USE_GTK
+      fprintf (stderr, "\nWarning: due to a long standing Gtk+ bug\nhttp://bugzilla.gnome.org/show_bug.cgi?id=85715\n\
+Emacs might crash when run in daemon mode and the X11 connection is unexpectedly lost.\n\
+Using an Emacs configured with --with-x-toolkit=lucid does not have this problem.\n");
+#endif
       f = fork ();
 #else /* NS_IMPL_COCOA */
       /* Under Cocoa we must do fork+exec as CoreFoundation lib fails in
diff --git a/src/fringe.c b/src/fringe.c
index 75c65bbcd87..d886ac48852 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1279,8 +1279,12 @@ update_window_fringes (struct window *w, int keep_current_p)
 
       if (row->overlay_arrow_bitmap != cur->overlay_arrow_bitmap)
         {
-          redraw_p = row->redraw_fringe_bitmaps_p = cur->redraw_fringe_bitmaps_p = 1;
-          cur->overlay_arrow_bitmap = row->overlay_arrow_bitmap;
+          redraw_p = row->redraw_fringe_bitmaps_p = 1;
+          if (!keep_current_p)
+            {
+              cur->redraw_fringe_bitmaps_p = 1;
+              cur->overlay_arrow_bitmap = row->overlay_arrow_bitmap;
+            }
         }
 
       row->left_fringe_bitmap = left;