[Emacs-diffs] /srv/bzr/emacs/trunk r104491: Merge from emacs-23; up to r100591.

[Glenn Morris]

------------------------------------------------------------
revno: 104491 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-06-04 11:29:18 -0700
message:
  Merge from emacs-23; up to r100591.
modified:
  src/ChangeLog
  src/emacs.c
  src/fringe.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-06-04 08:04:48 +0000
+++ b/src/ChangeLog     2011-06-04 18:29:18 +0000
@@ -1,3 +1,12 @@
+2011-06-04  Dan Nicolaescu  <address@hidden>
+
+       * emacs.c (main): Warn when starting a GTK emacs in daemon mode.
+
+2011-06-04  YAMAMOTO Mitsuharu  <address@hidden>
+
+       * 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  <address@hidden>
 
        * bidi.c (bidi_level_of_next_char): Fix last change.

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2011-06-01 21:54:35 +0000
+++ b/src/emacs.c       2011-06-04 18:29:18 +0000
@@ -1002,6 +1002,11 @@
        }
 
 #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

=== modified file 'src/fringe.c'
--- a/src/fringe.c      2011-05-25 03:45:04 +0000
+++ b/src/fringe.c      2011-06-04 18:29:18 +0000
@@ -1279,8 +1279,12 @@
 
       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;