From: Glenn Morris Date: Fri, 18 Jan 2019 15:50:47 +0000 (-0800) Subject: Merge from origin/emacs-26 X-Git-Tag: emacs-27.0.90~3791 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=957090b79531fbd7729e5d28c3496b9114c1f543;p=emacs.git Merge from origin/emacs-26 b6d78a0 (origin/emacs-26) Fix a typo in ELisp manual c9f6f86 Prevent redrawing if frame is garbaged 00ba226 Attempt to fix hangs on MS-Windows due to C-g b26d637 Fix Calc graph output on MS-Windows 03818b0 Fix a minor mistake in ELisp manual 6ac5985 ; Fix some trivial doc typos 21b9026 * etc/tutorials/TUTORIAL: Fix typo (bug#34049) d223727 Fix UI of Buffer-menu 0f71655 Reinitialize ispell-really-enchant when changing the speller 9845044 Speed up loading css-mode --- 957090b79531fbd7729e5d28c3496b9114c1f543 diff --cc src/xdisp.c index 86495078fb6,0c3754a338f..867e5db69b5 --- a/src/xdisp.c +++ b/src/xdisp.c @@@ -32400,19 -32263,10 +32405,12 @@@ expose_window (struct window *w, XRecta static bool expose_window_tree (struct window *w, XRectangle *r) { +#ifndef HAVE_NS struct frame *f = XFRAME (w->frame); +#endif bool mouse_face_overwritten_p = false; - /* NS toolkits may have aleady modified the frame in expectation of - a successful redraw, so don't bail out here if the frame is - garbaged. */ - while (w - #if !defined (HAVE_NS) - && !FRAME_GARBAGED_P (f) - #endif - ) + while (w && !FRAME_GARBAGED_P (f)) { mouse_face_overwritten_p |= (WINDOWP (w->contents)