Commit 99a33b77 authored by Glenn Morris's avatar Glenn Morris

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

parents 1cfbb966 8b3115e7
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.
......
......@@ -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
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment