patch 8.0.1449: slow redrawing with DirectX

Problem:    Slow redrawing with DirectX.
Solution:   Avoid calling gui_mch_flush() unnecessarily, especially when
            updating the cursor. (Ken Takata, closes #2560)

runtime/doc/options.txt

@@ -6122,7 +6122,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		  geom	    pixelGeometry	int	0 - 2 (see below)
 		  renmode   renderingMode	int	0 - 6 (see below)
 		  taamode   textAntialiasMode	int	0 - 3 (see below)
-		  scrlines  Scroll Lines	int	>= 0  (see below)
+		  scrlines  Scroll Lines	int	(deprecated)
 
 		See this URL for detail (except for scrlines):
 		  https://msdn.microsoft.com/en-us/library/dd368190.aspx
@@ -6156,23 +6156,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 		See this URL for detail:
 		  https://msdn.microsoft.com/en-us/library/dd368170.aspx
 
-		For scrlines: threshold for lines to be scrolled.
-		    0 - Always use scrolling. (default)
-		    1 - Use full page redrawing.
-		  > 1 - If the lines to be scrolled is grater or equal to the
-			specified value, use redrawing.  Otherwise use
-			scrolling.
-
-		If you feel scrolling a page (CTRL-F) is too slow with DirectX
-		renderer, try this "scrlines" option.
-		When set it "1", Vim uses full page redrawing instead of
-		scrolling.  Redrawing a page is faster than scrolling a
-		page in some environments.
-		After that, when you feel scrolling lines (CTRL-Y) becomes
-		slow, please try "2" or greater value for this option.
-		It works threshold line number to switch scrolling to
-		redrawing.  Scrolling a few lines might be faster than
-		redrawing a page in some environments.
+		For scrlines:
+		This was used for optimizing scrolling behavior, however this
+		is now deprecated.  If specified, it is simply ignored.
 
 		Example: >
 		  set encoding=utf-8

src/Makefile

@@ -2101,10 +2101,10 @@ run_message_test: $(MESSAGE_TEST_TARGET)
 # These do not depend on the executable, compile it when needed.
 test1 \
 	test_eval \
-	test3 test11 test14 test15 test17 \
-	test29 test30 test36 test37 test39 \
+	test3 test11 test14 test17 \
+	test29 test30 test37 test39 \
 	test42 test44 test48 test49 \
-	test50 test52 test59 \
+	test52 test59 \
 	test64 test69 \
 	test70 test72 \
 	test85 test86 test87 test88 \

src/channel.c

@@ -2207,14 +2207,7 @@ channel_exe_cmd(channel_T *channel, ch_part_T part, typval_T *argv)
 	ex_redraw(&ea);
 	showruler(FALSE);
 	setcursor();
-	out_flush();
-#ifdef FEAT_GUI
-	if (gui.in_use)
-	{
-	    gui_update_cursor(TRUE, FALSE);
-	    gui_mch_flush();
-	}
-#endif
+	out_flush_cursor(TRUE, FALSE);
     }
     else if (STRCMP(cmd, "expr") == 0 || STRCMP(cmd, "call") == 0)
     {

src/edit.c

@@ -3451,7 +3451,7 @@ ins_compl_clear(void)
     compl_orig_text = NULL;
     compl_enter_selects = FALSE;
     /* clear v:completed_item */
-    set_vim_var_dict(VV_COMPLETED_ITEM, dict_alloc());
+    set_vim_var_dict(VV_COMPLETED_ITEM, dict_alloc_lock(VAR_FIXED));
 }
 
 /*
@@ -3553,8 +3553,7 @@ ins_compl_new_leader(void)
 	{
 	    /* Show the cursor after the match, not after the redrawn text. */
 	    setcursor();
-	    out_flush();
-	    gui_update_cursor(FALSE, FALSE);
+	    out_flush_cursor(FALSE, FALSE);
 	}
 #endif
 	compl_restarting = TRUE;
@@ -4704,7 +4703,7 @@ ins_compl_delete(void)
      * flicker, thus we can't do that. */
     changed_cline_bef_curs();
     /* clear v:completed_item */
-    set_vim_var_dict(VV_COMPLETED_ITEM, dict_alloc());
+    set_vim_var_dict(VV_COMPLETED_ITEM, dict_alloc_lock(VAR_FIXED));
 }
 
 /*
@@ -4724,7 +4723,7 @@ ins_compl_insert(int in_compl_func)
 
     /* Set completed item. */
     /* { word, abbr, menu, kind, info } */
-    dict = dict_alloc();
+    dict = dict_alloc_lock(VAR_FIXED);
     if (dict != NULL)
     {
 	dict_add_nr_str(dict, "word", 0L,
@@ -4936,8 +4935,7 @@ ins_compl_next(
 	{
 	    /* Show the cursor after the match, not after the redrawn text. */
 	    setcursor();
-	    out_flush();
-	    gui_update_cursor(FALSE, FALSE);
+	    out_flush_cursor(FALSE, FALSE);
 	}
 #endif
 

src/getchar.c

@@ -2972,16 +2972,10 @@ inchar(
     if (wait_time == -1L || wait_time > 100L)  /* flush output before waiting */
     {
 	cursor_on();
-	out_flush();
-#ifdef FEAT_GUI
-	if (gui.in_use)
-	{
-	    gui_update_cursor(FALSE, FALSE);
-# ifdef FEAT_MOUSESHAPE
-	    if (postponed_mouseshape)
-		update_mouseshape(-1);
-# endif
-	}
+	out_flush_cursor(FALSE, FALSE);
+#if defined(FEAT_GUI) && defined(FEAT_MOUSESHAPE)
+	if (gui.in_use && postponed_mouseshape)
+	    update_mouseshape(-1);
 #endif
     }
 

src/gui.c

@@ -55,6 +55,7 @@ enum {
 static void gui_attempt_start(void);
 
 static int can_update_cursor = TRUE; /* can display the cursor */
+static int disable_flush = 0;	/* If > 0, gui_mch_flush() is disabled. */
 
 /*
  * The Athena scrollbars can move the thumb to after the end of the scrollbar,
@@ -1976,7 +1977,7 @@ gui_write(
     gui.dragged_sb = SBAR_NONE;
 #endif
 
-    gui_mch_flush();		    /* In case vim decides to take a nap */
+    gui_may_flush();		    /* In case vim decides to take a nap */
 }
 
 /*
@@ -2004,6 +2005,34 @@ gui_can_update_cursor(void)
      * after scrolling. */
 }
 
+/*
+ * Disable issuing gui_mch_flush().
+ */
+    void
+gui_disable_flush(void)
+{
+    ++disable_flush;
+}
+
+/*
+ * Enable issuing gui_mch_flush().
+ */
+    void
+gui_enable_flush(void)
+{
+    --disable_flush;
+}
+
+/*
+ * Issue gui_mch_flush() if it is not disabled.
+ */
+    void
+gui_may_flush(void)
+{
+    if (disable_flush == 0)
+	gui_mch_flush();
+}
+
     static void
 gui_outstr(char_u *s, int len)
 {
@@ -3682,7 +3711,6 @@ gui_update_tabline(void)
 	/* Updating the tabline uses direct GUI commands, flush
 	 * outstanding instructions first. (esp. clear screen) */
 	out_flush();
-	gui_mch_flush();
 
 	if (!showit != !shown)
 	    gui_mch_show_tabline(showit);
@@ -4122,8 +4150,7 @@ gui_drag_scrollbar(scrollbar_T *sb, long value, int still_dragging)
 	setcursor();
     }
 # endif
-    out_flush();
-    gui_update_cursor(FALSE, TRUE);
+    out_flush_cursor(FALSE, TRUE);
 #else
     add_to_input_buf(bytes, byte_count);
     add_long_to_buf((long_u)value, bytes);
@@ -4486,7 +4513,9 @@ gui_do_scroll(void)
 	 * disappear when losing focus after a scrollbar drag. */
 	if (wp->w_redr_type < type)
 	    wp->w_redr_type = type;
+	mch_disable_flush();
 	updateWindow(wp);   /* update window, status line, and cmdline */
+	mch_enable_flush();
     }
 
 #ifdef FEAT_INS_EXPAND
@@ -4797,8 +4826,7 @@ gui_focus_change(int in_focus)
  */
 #if 1
     gui.in_focus = in_focus;
-    out_flush();		/* make sure output has been written */
-    gui_update_cursor(TRUE, FALSE);
+    out_flush_cursor(TRUE, FALSE);
 
 # ifdef FEAT_XIM
     xim_set_focus(in_focus);
@@ -5157,9 +5185,7 @@ gui_update_screen(void)
 	curwin->w_valid &= ~VALID_CROW;
     }
 # endif
-    out_flush();		/* make sure output has been written */
-    gui_update_cursor(TRUE, FALSE);
-    gui_mch_flush();
+    out_flush_cursor(TRUE, FALSE);
 }
 #endif
 
@@ -5516,9 +5542,7 @@ gui_handle_drop(
 	maketitle();
 #endif
 	setcursor();
-	out_flush();
-	gui_update_cursor(FALSE, FALSE);
-	gui_mch_flush();
+	out_flush_cursor(FALSE, FALSE);
     }
 
     entered = FALSE;

src/gui_dwrite.cpp

@@ -286,6 +286,7 @@ struct DWriteContext {
     ID2D1DCRenderTarget *mRT;
     ID2D1GdiInteropRenderTarget *mGDIRT;
     ID2D1SolidColorBrush *mBrush;
+    ID2D1Bitmap *mBitmap;
 
     IDWriteFactory *mDWriteFactory;
 #ifdef FEAT_DIRECTX_COLOR_EMOJI
@@ -319,6 +320,8 @@ struct DWriteContext {
 
     void SetFont(HFONT hFont);
 
+    void Rebind();
+
     void BindDC(HDC hdc, const RECT *rect);
 
     HRESULT SetDrawingMode(DrawingMode mode);
@@ -335,6 +338,8 @@ struct DWriteContext {
 
     void SetPixel(int x, int y, COLORREF color);
 
+    void Scroll(int x, int y, const RECT *rc);
+
     void Flush();
 
     void SetRenderingParams(
@@ -596,6 +601,7 @@ DWriteContext::DWriteContext() :
     mRT(NULL),
     mGDIRT(NULL),
     mBrush(NULL),
+    mBitmap(NULL),
     mDWriteFactory(NULL),
 #ifdef FEAT_DIRECTX_COLOR_EMOJI
     mDWriteFactory2(NULL),
@@ -615,9 +621,6 @@ DWriteContext::DWriteContext() :
 	    reinterpret_cast<void**>(&mD2D1Factory));
     _RPT2(_CRT_WARN, "D2D1CreateFactory: hr=%p p=%p\n", hr, mD2D1Factory);
 
-    if (SUCCEEDED(hr))
-	hr = CreateDeviceResources();
-
     if (SUCCEEDED(hr))
     {
 	hr = DWriteCreateFactory(
@@ -662,6 +665,7 @@ DWriteContext::~DWriteContext()
 #ifdef FEAT_DIRECTX_COLOR_EMOJI
     SafeRelease(&mDWriteFactory2);
 #endif
+    SafeRelease(&mBitmap);
     SafeRelease(&mBrush);
     SafeRelease(&mGDIRT);
     SafeRelease(&mRT);
@@ -704,13 +708,7 @@ DWriteContext::CreateDeviceResources()
     }
 
     if (SUCCEEDED(hr))
-    {
-	if (mHDC != NULL)
-	{
-	    mRT->BindDC(mHDC, &mBindRect);
-	    mRT->SetTransform(D2D1::IdentityMatrix());
-	}
-    }
+	Rebind();
 
     return hr;
 }
@@ -718,6 +716,7 @@ DWriteContext::CreateDeviceResources()
     void
 DWriteContext::DiscardDeviceResources()
 {
+    SafeRelease(&mBitmap);
     SafeRelease(&mBrush);
     SafeRelease(&mGDIRT);
     SafeRelease(&mRT);
@@ -898,14 +897,37 @@ DWriteContext::SetFont(HFONT hFont)
     mFontCache.put(item);
 }
 
+    void
+DWriteContext::Rebind()
+{
+    SafeRelease(&mBitmap);
+
+    mRT->BindDC(mHDC, &mBindRect);
+    mRT->SetTransform(D2D1::IdentityMatrix());
+
+    D2D1_BITMAP_PROPERTIES props = {
+	{DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE},
+	96.0f, 96.0f
+    };
+    mRT->CreateBitmap(
+	    D2D1::SizeU(mBindRect.right - mBindRect.left,
+		mBindRect.bottom - mBindRect.top),
+	    props, &mBitmap);
+}
+
     void
 DWriteContext::BindDC(HDC hdc, const RECT *rect)
 {
-    Flush();
-    mRT->BindDC(hdc, rect);
-    mRT->SetTransform(D2D1::IdentityMatrix());
     mHDC = hdc;
     mBindRect = *rect;
+
+    if (mRT == NULL)
+	CreateDeviceResources();
+    else
+    {
+	Flush();
+	Rebind();
+    }
 }
 
     HRESULT
@@ -1080,6 +1102,49 @@ DWriteContext::SetPixel(int x, int y, COLORREF color)
     }
 }
 
+    void
+DWriteContext::Scroll(int x, int y, const RECT *rc)
+{
+    SetDrawingMode(DM_DIRECTX);
+    mRT->Flush();
+
+    D2D1_RECT_U srcRect;
+    D2D1_POINT_2U destPoint;
+    if (x >= 0)
+    {
+	srcRect.left = rc->left;
+	srcRect.right = rc->right - x;
+	destPoint.x = rc->left + x;
+    }
+    else
+    {
+	srcRect.left = rc->left - x;
+	srcRect.right = rc->right;
+	destPoint.x = rc->left;
+    }
+    if (y >= 0)
+    {
+	srcRect.top = rc->top;
+	srcRect.bottom = rc->bottom - y;
+	destPoint.y = rc->top + y;
+    }
+    else
+    {
+	srcRect.top = rc->top - y;
+	srcRect.bottom = rc->bottom;
+	destPoint.y = rc->top;
+    }
+    mBitmap->CopyFromRenderTarget(&destPoint, mRT, &srcRect);
+
+    D2D1_RECT_F destRect = {
+	    FLOAT(destPoint.x), FLOAT(destPoint.y),
+	    FLOAT(destPoint.x + srcRect.right - srcRect.left),
+	    FLOAT(destPoint.y + srcRect.bottom - srcRect.top)
+    };
+    mRT->DrawBitmap(mBitmap, destRect, 1.0F,
+	    D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, destRect);
+}
+
     void
 DWriteContext::Flush()
 {
@@ -1239,6 +1304,13 @@ DWriteContext_SetPixel(DWriteContext *ctx, int x, int y, COLORREF color)
 	ctx->SetPixel(x, y, color);
 }
 
+    void
+DWriteContext_Scroll(DWriteContext *ctx, int x, int y, const RECT *rc)
+{
+    if (ctx != NULL)
+	ctx->Scroll(x, y, rc);
+}
+
     void
 DWriteContext_Flush(DWriteContext *ctx)
 {

src/gui_dwrite.h

@@ -74,6 +74,7 @@ void DWriteContext_FillRect(DWriteContext *ctx, const RECT *rc, COLORREF color);
 void DWriteContext_DrawLine(DWriteContext *ctx, int x1, int y1, int x2, int y2,
 	COLORREF color);
 void DWriteContext_SetPixel(DWriteContext *ctx, int x, int y, COLORREF color);
+void DWriteContext_Scroll(DWriteContext *ctx, int x, int y, const RECT *rc);
 void DWriteContext_Flush(DWriteContext *ctx);
 void DWriteContext_Close(DWriteContext *ctx);
 

src/gui_w32.c

@@ -36,7 +36,6 @@
 static DWriteContext *s_dwc = NULL;
 static int s_directx_enabled = 0;
 static int s_directx_load_attempted = 0;
-static int s_directx_scrlines = 0;
 # define IS_ENABLE_DIRECTX() (s_directx_enabled && s_dwc != NULL && enc_utf8)
 static int directx_enabled(void);
 static void directx_binddc(void);
@@ -61,7 +60,6 @@ gui_mch_set_rendering_options(char_u *s)
     int	    dx_geom = 0;
     int	    dx_renmode = 0;
     int	    dx_taamode = 0;
-    int	    dx_scrlines = 0;
 
     /* parse string as rendering options. */
     for (p = s; p != NULL && *p != NUL; )
@@ -124,7 +122,7 @@ gui_mch_set_rendering_options(char_u *s)
 	}
 	else if (STRCMP(name, "scrlines") == 0)
 	{
-	    dx_scrlines = atoi((char *)value);
+	    /* Deprecated.  Simply ignore it. */
 	}
 	else
 	    return FAIL;
@@ -159,7 +157,6 @@ gui_mch_set_rendering_options(char_u *s)
 	}
     }
     s_directx_enabled = dx_enable;
-    s_directx_scrlines = dx_scrlines;
 
     return OK;
 # else
@@ -3129,9 +3126,6 @@ gui_mch_delete_lines(
     int	    num_lines)
 {
     RECT	rc;
-#if defined(FEAT_DIRECTX)
-    int		use_redraw = 0;
-#endif
 
     rc.left = FILL_X(gui.scroll_region_left);
     rc.right = FILL_X(gui.scroll_region_right + 1);
@@ -3141,16 +3135,10 @@ gui_mch_delete_lines(
 #if defined(FEAT_DIRECTX)
     if (IS_ENABLE_DIRECTX())
     {
-	if (s_directx_scrlines > 0 && s_directx_scrlines <= num_lines)
-	{
-	    gui_redraw(rc.left, rc.top,
-		    rc.right - rc.left + 1, rc.bottom - rc.top + 1);
-	    use_redraw = 1;
-	}
-	else
-	    DWriteContext_Flush(s_dwc);
+	DWriteContext_Scroll(s_dwc, 0, -num_lines * gui.char_height, &rc);
+	DWriteContext_Flush(s_dwc);
     }
-    if (!use_redraw)
+    else
 #endif
     {
 	intel_gpu_workaround();
@@ -3180,9 +3168,6 @@ gui_mch_insert_lines(
     int		num_lines)
 {
     RECT	rc;
-#if defined(FEAT_DIRECTX)
-    int		use_redraw = 0;
-#endif
 
     rc.left = FILL_X(gui.scroll_region_left);
     rc.right = FILL_X(gui.scroll_region_right + 1);
@@ -3192,16 +3177,10 @@ gui_mch_insert_lines(
 #if defined(FEAT_DIRECTX)
     if (IS_ENABLE_DIRECTX())
     {
-	if (s_directx_scrlines > 0 && s_directx_scrlines <= num_lines)
-	{
-	    gui_redraw(rc.left, rc.top,
-		    rc.right - rc.left + 1, rc.bottom - rc.top + 1);
-	    use_redraw = 1;
-	}
-	else
-	    DWriteContext_Flush(s_dwc);
+	DWriteContext_Scroll(s_dwc, 0, num_lines * gui.char_height, &rc);
+	DWriteContext_Flush(s_dwc);
     }
-    if (!use_redraw)
+    else
 #endif
     {
 	intel_gpu_workaround();
@@ -4024,7 +4003,10 @@ _OnScroll(
      * position, but don't actually scroll by setting "dont_scroll". */
     dont_scroll = !allow_scrollbar;
 
+    mch_disable_flush();
     gui_drag_scrollbar(sb, val, dragging);
+    mch_enable_flush();
+    gui_may_flush();
 
     s_busy_processing = FALSE;
     dont_scroll = dont_scroll_save;
@@ -4651,6 +4633,7 @@ _OnMouseWheel(
     if (mouse_scroll_lines == 0)
 	init_mouse_wheel();
 
+    mch_disable_flush();
     if (mouse_scroll_lines > 0
 	    && mouse_scroll_lines < (size > 2 ? size - 2 : 1))
     {
@@ -4659,6 +4642,8 @@ _OnMouseWheel(
     }
     else
 	_OnScroll(hwnd, hwndCtl, zDelta >= 0 ? SB_PAGEUP : SB_PAGEDOWN, 0);
+    mch_enable_flush();
+    gui_may_flush();
 }
 
 #ifdef USE_SYSMENU_FONT

src/if_ruby.c

@@ -377,7 +377,7 @@ static unsigned long (*dll_rb_num2uint) (VALUE);
 # endif
 static VALUE (*dll_rb_lastline_get) (void);
 static void (*dll_rb_lastline_set) (VALUE);
-static void (*dll_rb_protect) (VALUE (*)(VALUE), int, int*);
+static VALUE (*dll_rb_protect) (VALUE (*)(VALUE), VALUE, int*);
 static void (*dll_rb_load) (VALUE, int);
 static long (*dll_rb_num2long) (VALUE);
 static unsigned long (*dll_rb_num2ulong) (VALUE);
@@ -828,15 +828,22 @@ void ex_rubydo(exarg_T *eap)
     }
 }
 
+VALUE rb_load_wrap(VALUE file_to_load)
+{
+    rb_load(file_to_load, 0);
+    return Qnil;
+}
+
 void ex_rubyfile(exarg_T *eap)
 {
     int state;
 
     if (ensure_ruby_initialized())
     {
-	rb_protect((VALUE (*)(VALUE))rb_load, rb_str_new2((char *)eap->arg),
-								       &state);
-	if (state) error_print(state);
+	VALUE file_to_load = rb_str_new2((const char *)eap->arg);
+	rb_protect(rb_load_wrap, file_to_load, &state);
+	if (state)
+	    error_print(state);
     }
 }
 

src/macros.h

@@ -365,6 +365,17 @@
  * HIKEY2DI() converts a hashitem key pointer to a dictitem pointer.
  * HI2DI() converts a hashitem pointer to a dictitem pointer.
  */
-# define DI2HIKEY(di) ((di)->di_key)
-# define HIKEY2DI(p)  ((dictitem_T *)(p - offsetof(dictitem_T, di_key)))
-# define HI2DI(hi)     HIKEY2DI((hi)->hi_key)
+#define DI2HIKEY(di) ((di)->di_key)
+#define HIKEY2DI(p)  ((dictitem_T *)(p - offsetof(dictitem_T, di_key)))
+#define HI2DI(hi)     HIKEY2DI((hi)->hi_key)
+
+/*
+ * Flush control functions.
+ */
+#ifdef FEAT_GUI
+# define mch_enable_flush()	gui_enable_flush()
+# define mch_disable_flush()	gui_disable_flush()
+#else
+# define mch_enable_flush()
+# define mch_disable_flush()
+#endif

src/main.c

@@ -1242,7 +1242,11 @@ main_loop(
 	    if (VIsual_active)
 		update_curbuf(INVERTED);/* update inverted part */
 	    else if (must_redraw)
+	    {
+		mch_disable_flush();	/* Stop issuing gui_mch_flush(). */
 		update_screen(0);
+		mch_enable_flush();
+	    }
 	    else if (redraw_cmdline || clear_cmdline)
 		showmode();
 	    redraw_statuslines();
@@ -1283,11 +1287,13 @@ main_loop(
 			|| conceal_cursor_line(curwin)
 			|| need_cursor_line_redraw))
 	    {
+		mch_disable_flush();	/* Stop issuing gui_mch_flush(). */
 		if (conceal_old_cursor_line != conceal_new_cursor_line
 			&& conceal_old_cursor_line
 						<= curbuf->b_ml.ml_line_count)
 		    update_single_line(curwin, conceal_old_cursor_line);
 		update_single_line(curwin, conceal_new_cursor_line);
+		mch_enable_flush();
 		curwin->w_valid &= ~VALID_CROW;
 	    }
 # endif
@@ -4212,11 +4218,7 @@ eval_client_expr_to_string(char_u *expr)
     /* A client can tell us to redraw, but not to display the cursor, so do
      * that here. */
     setcursor();
-    out_flush();
-#ifdef FEAT_GUI
-    if (gui.in_use)
-	gui_update_cursor(FALSE, FALSE);
-#endif
+    out_flush_cursor(FALSE, FALSE);
 
     return res;
 }

src/message.c

@@ -2316,7 +2316,9 @@ msg_scroll_up(void)
 	gui_undraw_cursor();
 #endif
     /* scrolling up always works */
+    mch_disable_flush();
     screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL);
+    mch_enable_flush();
 
     if (!can_clear((char_u *)" "))
     {

src/netbeans.c

@@ -121,14 +121,7 @@ netbeans_close(void)
     update_screen(CLEAR);
     setcursor();
     cursor_on();
-    out_flush();
-#ifdef FEAT_GUI
-    if (gui.in_use)
-    {
-	gui_update_cursor(TRUE, FALSE);
-	gui_mch_flush();
-    }
-#endif
+    out_flush_cursor(TRUE, FALSE);
 }
 
 #define NB_DEF_HOST "localhost"
@@ -1848,14 +1841,8 @@ nb_do_cmd(
 	    update_screen(VALID);
 	    setcursor();
 	    cursor_on();
-	    out_flush();
-#ifdef FEAT_GUI
-	    if (gui.in_use)
-	    {
-		gui_update_cursor(TRUE, FALSE);
-		gui_mch_flush();
-	    }
-#endif
+	    out_flush_cursor(TRUE, FALSE);
+
 	    /* Quit a hit-return or more prompt. */
 	    if (State == HITRETURN || State == ASKMORE)
 	    {
@@ -2248,14 +2235,8 @@ nb_do_cmd(
 	update_screen(NOT_VALID);
 	setcursor();
 	cursor_on();
-	out_flush();
-#ifdef FEAT_GUI
-	if (gui.in_use)
-	{
-	    gui_update_cursor(TRUE, FALSE);
-	    gui_mch_flush();
-	}
-#endif
+	out_flush_cursor(TRUE, FALSE);
+
 	/* Quit a hit-return or more prompt. */
 	if (State == HITRETURN || State == ASKMORE)
 	{
@@ -2307,15 +2288,7 @@ coloncmd(char *cmd, ...)
 /*     ALT_INPUT_LOCK_OFF; */
 
     setcursor();		/* restore the cursor position */
-    out_flush();		/* make sure output has been written */
-
-#ifdef FEAT_GUI
-    if (gui.in_use)
-    {
-	gui_update_cursor(TRUE, FALSE);
-	gui_mch_flush();
-    }
-#endif
+    out_flush_cursor(TRUE, FALSE);
 }
 
 
@@ -2569,14 +2542,7 @@ netbeans_open(char *params, int doabort)
     update_screen(CLEAR);
     setcursor();
     cursor_on();
-    out_flush();
-#ifdef FEAT_GUI
-    if (gui.in_use)
-    {
-	gui_update_cursor(TRUE, FALSE);
-	gui_mch_flush();
-    }
-#endif
+    out_flush_cursor(TRUE, FALSE);
 }
 
 /*

src/proto/gui.pro

@@ -25,6 +25,9 @@ void gui_update_cursor_later(void);
 void gui_write(char_u *s, int len);
 void gui_dont_update_cursor(int undraw);
 void gui_can_update_cursor(void);
+void gui_disable_flush(void);
+void gui_enable_flush(void);
+void gui_may_flush(void);
 int gui_outstr_nowrap(char_u *s, int len, int flags, guicolor_T fg, guicolor_T bg, int back);
 void gui_undraw_cursor(void);
 void gui_redraw(int x, int y, int w, int h);

src/proto/term.pro

@@ -12,6 +12,7 @@ int term_is_gui(char_u *name);
 char_u *tltoa(unsigned long i);
 void termcapinit(char_u *name);
 void out_flush(void);
+void out_flush_cursor(int force, int clear_selection);
 void out_flush_check(void);
 void out_trash(void);
 void out_char(unsigned c);

src/screen.c

@@ -468,16 +468,14 @@ redraw_after_callback(int call_update_screen)
 	setcursor();
     }
     cursor_on();
-    out_flush();
 #ifdef FEAT_GUI
-    if (gui.in_use)
-    {
+    if (gui.in_use && !gui_mch_is_blink_off())
 	/* Don't update the cursor when it is blinking and off to avoid
 	 * flicker. */
-	if (!gui_mch_is_blink_off())
-	    gui_update_cursor(FALSE, FALSE);
-	gui_mch_flush();
-    }
+	out_flush_cursor(FALSE, FALSE);
+    else
+#else
+	out_flush();
 #endif
 
     --redrawing_for_callback;
@@ -800,9 +798,12 @@ update_screen(int type_arg)
      * done. */
     if (gui.in_use)
     {
-	out_flush();	/* required before updating the cursor */
 	if (did_undraw && !gui_mch_is_blink_off())
 	{
+	    mch_disable_flush();
+	    out_flush();	/* required before updating the cursor */
+	    mch_enable_flush();
+
 	    /* Put the GUI position where the cursor was, gui_update_cursor()
 	     * uses that. */
 	    gui.col = gui_cursor_col;
@@ -811,9 +812,12 @@ update_screen(int type_arg)
 	    gui.col = mb_fix_col(gui.col, gui.row);
 # endif
 	    gui_update_cursor(FALSE, FALSE);
+	    gui_may_flush();
 	    screen_cur_col = gui.col;
 	    screen_cur_row = gui.row;
 	}
+	else
+	    out_flush();
 	gui_update_scrollbars(FALSE);
     }
 #endif
@@ -863,8 +867,7 @@ update_finish(void)
      * done. */
     if (gui.in_use)
     {
-	out_flush();	/* required before updating the cursor */
-	gui_update_cursor(FALSE, FALSE);
+	out_flush_cursor(FALSE, FALSE);
 	gui_update_scrollbars(FALSE);
     }
 # endif

src/search.c

@@ -2675,14 +2675,8 @@ showmatch(
 	    showruler(FALSE);
 	    setcursor();
 	    cursor_on();		/* make sure that the cursor is shown */
-	    out_flush();
-#ifdef FEAT_GUI
-	    if (gui.in_use)
-	    {
-		gui_update_cursor(TRUE, FALSE);
-		gui_mch_flush();
-	    }
-#endif
+	    out_flush_cursor(TRUE, FALSE);
+
 	    /* Restore dollar_vcol(), because setcursor() may call curs_rows()
 	     * which resets it if the matching position is in a previous line
 	     * and has a higher column number. */

src/term.c

@@ -2501,6 +2501,27 @@ out_flush(void)
     }
 }
 
+/*
+ * out_flush_cursor(): flush the output buffer and redraw the cursor
+ */
+    void
+out_flush_cursor(
+    int	    force UNUSED,   /* when TRUE, update cursor even when not moved */
+    int	    clear_selection UNUSED) /* clear selection under cursor */
+{
+    mch_disable_flush();
+    out_flush();
+    mch_enable_flush();
+#ifdef FEAT_GUI
+    if (gui.in_use)
+    {
+	gui_update_cursor(force, clear_selection);
+	gui_may_flush();
+    }
+#endif
+}
+
+
 #if defined(FEAT_MBYTE) || defined(PROTO)
 /*
  * Sometimes a byte out of a multi-byte character is written with out_char().

src/testdir/Make_all.mak

@@ -15,9 +15,7 @@ SCRIPTS_FIRST = \
 SCRIPTS_ALL = \
 	test3.out \
 	test14.out \
-	test15.out \
 	test29.out \
-	test36.out \
 	test37.out \
 	test39.out \
 	test42.out \
@@ -57,7 +55,7 @@ SCRIPTS_MORE4 = \
 
 
 # Tests specifically for MS-Windows.
-SCRIPTS_WIN32 = test50.out
+SCRIPTS_WIN32 =
 
 
 # Tests for the GUI.
@@ -158,6 +156,7 @@ NEW_TESTS = test_arabic.res \
 	    test_ruby.res \
 	    test_scrollbind.res \
 	    test_search.res \
+	    test_shortpathname.res \
 	    test_signs.res \
 	    test_smartindent.res \
 	    test_spell.res \

src/testdir/Make_vms.mms

@@ -74,9 +74,9 @@ VIMPROG = <->vim.exe
 .SUFFIXES : .out .in
 
 SCRIPT = test1.out test3.out \
-       test14.out test15.out \
+       test14.out \
        test29.out \
-       test30.out test36.out test37.out test39.out \
+       test30.out test37.out test39.out \
        test42.out test44.out test48.out test49.out \
        test64.out test69.out \
        test72.out test77a.out test88.out \
@@ -108,7 +108,7 @@ SCRIPT_UNIX = test10.out test17.out test27.out test49.out
 .ENDIF
 
 .IFDEF WANT_WIN
-SCRIPT_WIN = test50.out test52.out
+SCRIPT_WIN = test52.out
 .ENDIF
 
 .IFDEF WANT_SPELL

src/testdir/main.aap

@@ -6,10 +6,10 @@ VimProg ?= ../vim
 
 Scripts = test1.out test2.out test3.out test6.out
 		test11.out
-		test13.out test14.out test15.out test17.out
+		test13.out test14.out test17.out
 		test18.out test21.out
 		test27.out test29.out test30.out
-		test36.out test37.out
+		test37.out
 		test39.out test42.out
 		test44.out test46.out test47.out
 		test48.out test49.out test74.out

src/testdir/test15.in

@@ -1,136 +0,0 @@
-Tests for :right on text with embedded TAB.
-Also test formatting a paragraph.
-Also test undo after ":%s" and formatting.
-
-STARTTEST
-:so small.vim
-:set tw=65
-
-:/^\s*test for :left/,/^\s*test for :center/ left
-:/^\s*test for :center/,/^\s*test for :right/ center
-:/^\s*test for :right/,/^xxx/-1 right
-:set fo+=tcroql tw=72
-/xxxxxxxx$
-0gq6kk
-:set nocp viminfo+=nviminfo
-:" undo/redo here to make the next undo only work on the following changes
-u
-:map gg :.,.+2s/^/x/<CR>kk:set tw=3<CR>gqq
-/^aa
-ggu
-:?test for :left?,$w! test.out
-:qa!
-ENDTEST
-
-	test for :left
-	  a		a
-	    fa		a
-	  dfa		a
-	        sdfa		a
-	  asdfa		a
-	        xasdfa		a
-asxxdfa		a
-
-	test for :center
-	  a		a
-	    fa		afd asdf
-	  dfa		a
-	        sdfa		afd asdf
-	  asdfa		a
-	        xasdfa		asdfasdfasdfasdfasdf
-asxxdfa		a
-
-	test for :right
-	a		a
-	fa		a
-	dfa		a
-	sdfa		a
-	asdfa		a
-	xasdfa		a
-	asxxdfa		a
-	asxa;ofa		a
-	asdfaqwer		a
-	a		ax
-	fa		ax
-	dfa		ax
-	sdfa		ax
-	asdfa		ax
-	xasdfa		ax
-	asxxdfa		ax
-	asxa;ofa		ax
-	asdfaqwer		ax
-	a		axx
-	fa		axx
-	dfa		axx
-	sdfa		axx
-	asdfa		axx
-	xasdfa		axx
-	asxxdfa		axx
-	asxa;ofa		axx
-	asdfaqwer		axx
-	a		axxx
-	fa		axxx
-	dfa		axxx
-	sdfa		axxx
-	asdfa		axxx
-	xasdfa		axxx
-	asxxdfa		axxx
-	asxa;ofa		axxx
-	asdfaqwer		axxx
-	a		axxxo
-	fa		axxxo
-	dfa		axxxo
-	sdfa		axxxo
-	asdfa		axxxo
-	xasdfa		axxxo
-	asxxdfa		axxxo
-	asxa;ofa		axxxo
-	asdfaqwer		axxxo
-	a		axxxoi
-	fa		axxxoi
-	dfa		axxxoi
-	sdfa		axxxoi
-	asdfa		axxxoi
-	xasdfa		axxxoi
-	asxxdfa		axxxoi
-	asxa;ofa		axxxoi
-	asdfaqwer		axxxoi
-	a		axxxoik
-	fa		axxxoik
-	dfa		axxxoik
-	sdfa		axxxoik
-	asdfa		axxxoik
-	xasdfa		axxxoik
-	asxxdfa		axxxoik
-	asxa;ofa		axxxoik
-	asdfaqwer		axxxoik
-	a		axxxoike
-	fa		axxxoike
-	dfa		axxxoike
-	sdfa		axxxoike
-	asdfa		axxxoike
-	xasdfa		axxxoike
-	asxxdfa		axxxoike
-	asxa;ofa		axxxoike
-	asdfaqwer		axxxoike
-	a		axxxoikey
-	fa		axxxoikey
-	dfa		axxxoikey
-	sdfa		axxxoikey
-	asdfa		axxxoikey
-	xasdfa		axxxoikey
-	asxxdfa		axxxoikey
-	asxa;ofa		axxxoikey
-	asdfaqwer		axxxoikey
-
-xxxxx xx xxxxxx 
-xxxxxxx xxxxxxxxx xxx xxxx xxxxx xxxxx xxx xx
-xxxxxxxxxxxxxxxxxx xxxxx xxxx, xxxx xxxx xxxx xxxx xxx xx xx
-xx xxxxxxx. xxxx xxxx.
-
-> xx xx, xxxx xxxx xxx xxxx xxx xxxxx xxx xxx xxxxxxx xxx xxxxx
-> xxxxxx xxxxxxx: xxxx xxxxxxx, xx xxxxxx xxxx xxxxxxxxxx
-
-aa aa aa aa
-bb bb bb bb
-cc cc cc cc

src/testdir/test15.ok

@@ -1,111 +0,0 @@
-test for :left
-a		a
-fa		a
-dfa		a
-sdfa		a
-asdfa		a
-xasdfa		a
-asxxdfa		a
-
-			test for :center
-			 a		a
-		      fa		afd asdf
-			 dfa		a
-		    sdfa		afd asdf
-			 asdfa		a
-	      xasdfa		asdfasdfasdfasdfasdf
-			asxxdfa		a
-
-						  test for :right
-						      a		a
-						     fa		a
-						    dfa		a
-						   sdfa		a
-						  asdfa		a
-						 xasdfa		a
-						asxxdfa		a
-					       asxa;ofa		a
-					      asdfaqwer		a
-					      a		ax
-					     fa		ax
-					    dfa		ax
-					   sdfa		ax
-					  asdfa		ax
-					 xasdfa		ax
-					asxxdfa		ax
-				       asxa;ofa		ax
-				      asdfaqwer		ax
-					      a		axx
-					     fa		axx
-					    dfa		axx
-					   sdfa		axx
-					  asdfa		axx
-					 xasdfa		axx
-					asxxdfa		axx
-				       asxa;ofa		axx
-				      asdfaqwer		axx
-					      a		axxx
-					     fa		axxx
-					    dfa		axxx
-					   sdfa		axxx
-					  asdfa		axxx
-					 xasdfa		axxx
-					asxxdfa		axxx
-				       asxa;ofa		axxx
-				      asdfaqwer		axxx
-					      a		axxxo
-					     fa		axxxo
-					    dfa		axxxo
-					   sdfa		axxxo
-					  asdfa		axxxo
-					 xasdfa		axxxo
-					asxxdfa		axxxo
-				       asxa;ofa		axxxo
-				      asdfaqwer		axxxo
-					      a		axxxoi
-					     fa		axxxoi
-					    dfa		axxxoi
-					   sdfa		axxxoi
-					  asdfa		axxxoi
-					 xasdfa		axxxoi
-					asxxdfa		axxxoi
-				       asxa;ofa		axxxoi
-				      asdfaqwer		axxxoi
-					      a		axxxoik
-					     fa		axxxoik
-					    dfa		axxxoik
-					   sdfa		axxxoik
-					  asdfa		axxxoik
-					 xasdfa		axxxoik
-					asxxdfa		axxxoik
-				       asxa;ofa		axxxoik
-				      asdfaqwer		axxxoik
-					      a		axxxoike
-					     fa		axxxoike
-					    dfa		axxxoike
-					   sdfa		axxxoike
-					  asdfa		axxxoike
-					 xasdfa		axxxoike
-					asxxdfa		axxxoike
-				       asxa;ofa		axxxoike
-				      asdfaqwer		axxxoike
-					      a		axxxoikey
-					     fa		axxxoikey
-					    dfa		axxxoikey
-					   sdfa		axxxoikey
-					  asdfa		axxxoikey
-					 xasdfa		axxxoikey
-					asxxdfa		axxxoikey
-				       asxa;ofa		axxxoikey
-				      asdfaqwer		axxxoikey
-
-xxxxx xx xxxxxx xxxxxxx xxxxxxxxx xxx xxxx xxxxx xxxxx xxx xx
-xxxxxxxxxxxxxxxxxx xxxxx xxxx, xxxx xxxx xxxx xxxx xxx xx xx xx xxxxxxx.
-xxxx xxxx.
-
-> xx xx, xxxx xxxx xxx xxxx xxx xxxxx xxx xxx xxxxxxx xxx xxxxx xxxxxx
-> xxxxxxx: xxxx xxxxxxx, xx xxxxxx xxxx xxxxxxxxxx
-
-aa aa aa aa
-bb bb bb bb
-cc cc cc cc

src/testdir/test36.in

@@ -1,114 +0,0 @@
-Test character classes in regexp using regexpengine 0, 1, 2.
-
-STARTTEST
-/^start-here/+1
-Y:s/\%#=0\d//g
-p:s/\%#=1\d//g
-p:s/\%#=2\d//g
-p:s/\%#=0[0-9]//g
-p:s/\%#=1[0-9]//g
-p:s/\%#=2[0-9]//g
-p:s/\%#=0\D//g
-p:s/\%#=1\D//g
-p:s/\%#=2\D//g
-p:s/\%#=0[^0-9]//g
-p:s/\%#=1[^0-9]//g
-p:s/\%#=2[^0-9]//g
-p:s/\%#=0\o//g
-p:s/\%#=1\o//g
-p:s/\%#=2\o//g
-p:s/\%#=0[0-7]//g
-p:s/\%#=1[0-7]//g
-p:s/\%#=2[0-7]//g
-p:s/\%#=0\O//g
-p:s/\%#=1\O//g
-p:s/\%#=2\O//g
-p:s/\%#=0[^0-7]//g
-p:s/\%#=1[^0-7]//g
-p:s/\%#=2[^0-7]//g
-p:s/\%#=0\x//g
-p:s/\%#=1\x//g
-p:s/\%#=2\x//g
-p:s/\%#=0[0-9A-Fa-f]//g
-p:s/\%#=1[0-9A-Fa-f]//g
-p:s/\%#=2[0-9A-Fa-f]//g
-p:s/\%#=0\X//g
-p:s/\%#=1\X//g
-p:s/\%#=2\X//g
-p:s/\%#=0[^0-9A-Fa-f]//g
-p:s/\%#=1[^0-9A-Fa-f]//g
-p:s/\%#=2[^0-9A-Fa-f]//g
-p:s/\%#=0\w//g
-p:s/\%#=1\w//g
-p:s/\%#=2\w//g
-p:s/\%#=0[0-9A-Za-z_]//g
-p:s/\%#=1[0-9A-Za-z_]//g
-p:s/\%#=2[0-9A-Za-z_]//g
-p:s/\%#=0\W//g
-p:s/\%#=1\W//g
-p:s/\%#=2\W//g
-p:s/\%#=0[^0-9A-Za-z_]//g
-p:s/\%#=1[^0-9A-Za-z_]//g
-p:s/\%#=2[^0-9A-Za-z_]//g
-p:s/\%#=0\h//g
-p:s/\%#=1\h//g
-p:s/\%#=2\h//g
-p:s/\%#=0[A-Za-z_]//g
-p:s/\%#=1[A-Za-z_]//g
-p:s/\%#=2[A-Za-z_]//g
-p:s/\%#=0\H//g
-p:s/\%#=1\H//g
-p:s/\%#=2\H//g
-p:s/\%#=0[^A-Za-z_]//g
-p:s/\%#=1[^A-Za-z_]//g
-p:s/\%#=2[^A-Za-z_]//g
-p:s/\%#=0\a//g
-p:s/\%#=1\a//g
-p:s/\%#=2\a//g
-p:s/\%#=0[A-Za-z]//g
-p:s/\%#=1[A-Za-z]//g
-p:s/\%#=2[A-Za-z]//g
-p:s/\%#=0\A//g
-p:s/\%#=1\A//g
-p:s/\%#=2\A//g
-p:s/\%#=0[^A-Za-z]//g
-p:s/\%#=1[^A-Za-z]//g
-p:s/\%#=2[^A-Za-z]//g
-p:s/\%#=0\l//g
-p:s/\%#=1\l//g
-p:s/\%#=2\l//g
-p:s/\%#=0[a-z]//g
-p:s/\%#=1[a-z]//g
-p:s/\%#=2[a-z]//g
-p:s/\%#=0\L//g
-p:s/\%#=1\L//g
-p:s/\%#=2\L//g
-p:s/\%#=0[^a-z]//g
-p:s/\%#=1[^a-z]//g
-p:s/\%#=2[^a-z]//g
-p:s/\%#=0\u//g
-p:s/\%#=1\u//g
-p:s/\%#=2\u//g
-p:s/\%#=0[A-Z]//g
-p:s/\%#=1[A-Z]//g
-p:s/\%#=2[A-Z]//g
-p:s/\%#=0\U//g
-p:s/\%#=1\U//g
-p:s/\%#=2\U//g
-p:s/\%#=0[^A-Z]//g
-p:s/\%#=1[^A-Z]//g
-p:s/\%#=2[^A-Z]//g
-p:s/\%#=0\%210l^\t...//g
-p:s/\%#=1\%211l^\t...//g
-p:s/\%#=2\%212l^\t...//g
-p:s/\%#=0[0-z]//g
-p:s/\%#=1[0-z]//g
-p:s/\%#=2[0-z]//g
-p:s/\%#=0[^0-z]//g
-p:s/\%#=1[^0-z]//g
-p:s/\%#=2[^0-z]//g
-:/^start-here/+1,$wq! test.out
-ENDTEST
-
-start-here
-	

src/testdir/test36.ok

@@ -1,105 +0,0 @@
-	
- !"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-0123456789
-0123456789
-0123456789
-0123456789
-0123456789
-0123456789
-	
- !"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-01234567
-01234567
-01234567
-01234567
-01234567
-01234567
-	
- !"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-0123456789ABCDEFabcdef
-0123456789ABCDEFabcdef
-0123456789ABCDEFabcdef
-0123456789ABCDEFabcdef
-0123456789ABCDEFabcdef
-0123456789ABCDEFabcdef
-	
- !"#$%&'()#+'-./:;<=>?@[\]^`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./:;<=>?@[\]^`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./:;<=>?@[\]^`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./:;<=>?@[\]^`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./:;<=>?@[\]^`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./:;<=>?@[\]^`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-0123456789ABCDEFGHIXYZ_abcdefghiwxyz
-0123456789ABCDEFGHIXYZ_abcdefghiwxyz
-0123456789ABCDEFGHIXYZ_abcdefghiwxyz
-0123456789ABCDEFGHIXYZ_abcdefghiwxyz
-0123456789ABCDEFGHIXYZ_abcdefghiwxyz
-0123456789ABCDEFGHIXYZ_abcdefghiwxyz
-	
- !"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-ABCDEFGHIXYZ_abcdefghiwxyz
-ABCDEFGHIXYZ_abcdefghiwxyz
-ABCDEFGHIXYZ_abcdefghiwxyz
-ABCDEFGHIXYZ_abcdefghiwxyz
-ABCDEFGHIXYZ_abcdefghiwxyz
-ABCDEFGHIXYZ_abcdefghiwxyz
-	
- !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
- !"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~<><7F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-ABCDEFGHIXYZabcdefghiwxyz
-ABCDEFGHIXYZabcdefghiwxyz
-ABCDEFGHIXYZabcdefghiwxyz

src/testdir/test50.in

@@ -1,90 +0,0 @@
-Test for shortpathname ':8' extension.
-Only for use on Win32 systems!
-
-STARTTEST
-:so small.vim
-:fun! TestIt(file, bits, expected)
-	let res=fnamemodify(a:file,a:bits)
-	if a:expected == ''
-		echo "'".a:file."'->(".a:bits.")->'".res."'"
-	else
-		if substitute(res,'/','\\', 'g') != substitute( a:expected, '/','\\', 'g') 
-			echo "FAILED: '".a:file."'->(".a:bits.")->'".res."'"
-			echo "Expected: '".a:expected."'"
-		else
-			echo "OK"
-		endif
-	endif
-endfun
-:fun! MakeDir( dirname )
-	"exe '!mkdir '.substitute(a:dirname,'/','\\','g')
-	call system('mkdir '.substitute(a:dirname,'/','\\','g'))
-endfun
-:fun! RMDir( dirname)
-	"exe '!rmdir '.substitute(a:dirname,'/','\\','g')
-	call system('rmdir '.substitute(a:dirname,'/','\\','g'))
-endfun
-:fun! MakeFile( filename)
-	"exe '!copy nul '.substitute(a:filename,'/','\\','g')
-	call system('copy nul '.substitute(a:filename,'/','\\','g'))
-endfun
-:fun! TestColonEight()
-   redir! >test.out
-	" This could change for CygWin to //cygdrive/c
-	let dir1='c:/x.x.y'
-	if filereadable(dir1) || isdirectory(dir1)
-		echo "FATAL: '".dir1."' exists, cannot run test"
-		return
-	endif
-	let file1=dir1.'/zz.y.txt'
-	let nofile1=dir1.'/z.y.txt'
-	let dir2=dir1.'/VimIsTheGreatestSinceSlicedBread'
-	let file2=dir2.'/z.txt'
-	let nofile2=dir2.'/zz.txt'
-	call MakeDir( dir1 )
-	let resdir1 = substitute(fnamemodify(dir1, ':p:8'), '\\$', '', '')
-	if resdir1 !~ '\V\^c:/XX\x\x\x\x~1.Y\$'
-		echo "FATAL: unexpected short name: " . resdir1
-		echo "INFO: please report your OS to vim-dev"
-		return
-	endif
-	let resfile1=resdir1.'/ZZY~1.TXT'
-	let resnofile1=resdir1.'/z.y.txt'
-	let resdir2=resdir1.'/VIMIST~1'
-	let resfile2=resdir2.'/z.txt'
-	let resnofile2=resdir2.'/zz.txt'
-	call MakeDir( dir2 )
-	call MakeFile( file1 )
-	call MakeFile( file2 )
-	call TestIt(file1, ':p:8', resfile1)
-	call TestIt(nofile1, ':p:8', resnofile1)
-	call TestIt(file2, ':p:8', resfile2)
-	call TestIt(nofile2, ':p:8', resnofile2)
-	call TestIt(nofile2, ':p:8:h', fnamemodify(resnofile2,':h'))
-	exe 'cd '.dir1
-	call TestIt(file1, ':.:8', strpart(resfile1,strlen(resdir1)+1))
-	call TestIt(nofile1, ':.:8', strpart(resnofile1,strlen(resdir1)+1))
-	call TestIt(file2, ':.:8', strpart(resfile2,strlen(resdir1)+1))
-	call TestIt(nofile2, ':.:8', strpart(resnofile2,strlen(resdir1)+1))
-	let $HOME=dir1
-	call TestIt(file1, ':~:8', '~'.strpart(resfile1,strlen(resdir1)))
-	call TestIt(nofile1, ':~:8', '~'.strpart(resnofile1,strlen(resdir1)))
-	call TestIt(file2, ':~:8', '~'.strpart(resfile2,strlen(resdir1)))
-	call TestIt(nofile2, ':~:8', '~'.strpart(resnofile2,strlen(resdir1)))
-	cd c:/
-	call delete( file2 )
-	call delete( file1 )
-	call RMDir( dir2 )
-	call RMDir( dir1 )
-       echo
-   redir END
-endfun
-:let dir = getcwd()
-:call TestColonEight()
-:exe "cd " . dir
-:edit! test.out
-:set ff=dos
-:w
-:qa!
-ENDTEST
-

src/testdir/test50.ok

@@ -1,14 +0,0 @@
-
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK

src/testdir/test_regex_char_classes.vim

@@ -1,5 +1,11 @@
 " Tests for regexp with backslash and other special characters inside []
 " Also test backslash for hex/octal numbered character.
+"
+if !has('multi_byte')
+  finish
+endif
+
+scriptencoding utf-8
 
 function RunSTest(value, calls, expected)
   new
@@ -56,3 +62,237 @@ function Test_s_search()
   call RunSTest(" xyz", "s/~/bcd/", " bcd")
   call RunSTest(" bcdbcdbcd", "s/~\\+/BB/", " BB")
 endfunction
+
+" Test character classes in regexp using regexpengine 0, 1, 2.
+func Test_regex_char_classes()
+  new
+  let save_enc = &encoding
+  set encoding=utf-8
+
+  let input = "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+  " Format is [cmd_to_run, expected_output]
+  let tests = [
+    \ [':s/\%#=0\d//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1\d//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2\d//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0[0-9]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1[0-9]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2[0-9]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0\D//g',
+    \ "0123456789"],
+    \ [':s/\%#=1\D//g',
+    \ "0123456789"],
+    \ [':s/\%#=2\D//g',
+    \ "0123456789"],
+    \ [':s/\%#=0[^0-9]//g',
+    \ "0123456789"],
+    \ [':s/\%#=1[^0-9]//g',
+    \ "0123456789"],
+    \ [':s/\%#=2[^0-9]//g',
+    \ "0123456789"],
+    \ [':s/\%#=0\o//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1\o//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2\o//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0[0-7]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1[0-7]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2[0-7]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0\O//g',
+    \ "01234567"],
+    \ [':s/\%#=1\O//g',
+    \ "01234567"],
+    \ [':s/\%#=2\O//g',
+    \ "01234567"],
+    \ [':s/\%#=0[^0-7]//g',
+    \ "01234567"],
+    \ [':s/\%#=1[^0-7]//g',
+    \ "01234567"],
+    \ [':s/\%#=2[^0-7]//g',
+    \ "01234567"],
+    \ [':s/\%#=0\x//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1\x//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2\x//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0[0-9A-Fa-f]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1[0-9A-Fa-f]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2[0-9A-Fa-f]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0\X//g',
+    \ "0123456789ABCDEFabcdef"],
+    \ [':s/\%#=1\X//g',
+    \ "0123456789ABCDEFabcdef"],
+    \ [':s/\%#=2\X//g',
+    \ "0123456789ABCDEFabcdef"],
+    \ [':s/\%#=0[^0-9A-Fa-f]//g',
+    \ "0123456789ABCDEFabcdef"],
+    \ [':s/\%#=1[^0-9A-Fa-f]//g',
+    \ "0123456789ABCDEFabcdef"],
+    \ [':s/\%#=2[^0-9A-Fa-f]//g',
+    \ "0123456789ABCDEFabcdef"],
+    \ [':s/\%#=0\w//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1\w//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2\w//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0[0-9A-Za-z_]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1[0-9A-Za-z_]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2[0-9A-Za-z_]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0\W//g',
+    \ "0123456789ABCDEFGHIXYZ_abcdefghiwxyz"],
+    \ [':s/\%#=1\W//g',
+    \ "0123456789ABCDEFGHIXYZ_abcdefghiwxyz"],
+    \ [':s/\%#=2\W//g',
+    \ "0123456789ABCDEFGHIXYZ_abcdefghiwxyz"],
+    \ [':s/\%#=0[^0-9A-Za-z_]//g',
+    \ "0123456789ABCDEFGHIXYZ_abcdefghiwxyz"],
+    \ [':s/\%#=1[^0-9A-Za-z_]//g',
+    \ "0123456789ABCDEFGHIXYZ_abcdefghiwxyz"],
+    \ [':s/\%#=2[^0-9A-Za-z_]//g',
+    \ "0123456789ABCDEFGHIXYZ_abcdefghiwxyz"],
+    \ [':s/\%#=0\h//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1\h//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2\h//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0[A-Za-z_]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1[A-Za-z_]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2[A-Za-z_]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0\H//g',
+    \ "ABCDEFGHIXYZ_abcdefghiwxyz"],
+    \ [':s/\%#=1\H//g',
+    \ "ABCDEFGHIXYZ_abcdefghiwxyz"],
+    \ [':s/\%#=2\H//g',
+    \ "ABCDEFGHIXYZ_abcdefghiwxyz"],
+    \ [':s/\%#=0[^A-Za-z_]//g',
+    \ "ABCDEFGHIXYZ_abcdefghiwxyz"],
+    \ [':s/\%#=1[^A-Za-z_]//g',
+    \ "ABCDEFGHIXYZ_abcdefghiwxyz"],
+    \ [':s/\%#=2[^A-Za-z_]//g',
+    \ "ABCDEFGHIXYZ_abcdefghiwxyz"],
+    \ [':s/\%#=0\a//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1\a//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2\a//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0[A-Za-z]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1[A-Za-z]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2[A-Za-z]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0\A//g',
+    \ "ABCDEFGHIXYZabcdefghiwxyz"],
+    \ [':s/\%#=1\A//g',
+    \ "ABCDEFGHIXYZabcdefghiwxyz"],
+    \ [':s/\%#=2\A//g',
+    \ "ABCDEFGHIXYZabcdefghiwxyz"],
+    \ [':s/\%#=0[^A-Za-z]//g',
+    \ "ABCDEFGHIXYZabcdefghiwxyz"],
+    \ [':s/\%#=1[^A-Za-z]//g',
+    \ "ABCDEFGHIXYZabcdefghiwxyz"],
+    \ [':s/\%#=2[^A-Za-z]//g',
+    \ "ABCDEFGHIXYZabcdefghiwxyz"],
+    \ [':s/\%#=0\l//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1\l//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2\l//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0[a-z]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1[a-z]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2[a-z]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0\L//g',
+    \ "abcdefghiwxyz"],
+    \ [':s/\%#=1\L//g',
+    \ "abcdefghiwxyz"],
+    \ [':s/\%#=2\L//g',
+    \ "abcdefghiwxyz"],
+    \ [':s/\%#=0[^a-z]//g',
+    \ "abcdefghiwxyz"],
+    \ [':s/\%#=1[^a-z]//g',
+    \ "abcdefghiwxyz"],
+    \ [':s/\%#=2[^a-z]//g',
+    \ "abcdefghiwxyz"],
+    \ [':s/\%#=0\u//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1\u//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2\u//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0[A-Z]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1[A-Z]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2[A-Z]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0\U//g',
+    \ "ABCDEFGHIXYZ"],
+    \ [':s/\%#=1\U//g',
+    \ "ABCDEFGHIXYZ"],
+    \ [':s/\%#=2\U//g',
+    \ "ABCDEFGHIXYZ"],
+    \ [':s/\%#=0[^A-Z]//g',
+    \ "ABCDEFGHIXYZ"],
+    \ [':s/\%#=1[^A-Z]//g',
+    \ "ABCDEFGHIXYZ"],
+    \ [':s/\%#=2[^A-Z]//g',
+    \ "ABCDEFGHIXYZ"],
+    \ [':s/\%#=0\%' . line('.') . 'l^\t...//g',
+    \ "!\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1\%' . line('.') . 'l^\t...//g',
+    \ "!\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2\%' . line('.') . 'l^\t...//g',
+    \ "!\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0[0-z]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=1[0-z]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=2[0-z]//g',
+    \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./{|}~\<C-?>\u0080\u0082\u0090\u009b<39><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"],
+    \ [':s/\%#=0[^0-z]//g',
+    \ "0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz"],
+    \ [':s/\%#=1[^0-z]//g',
+    \ "0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz"],
+    \ [':s/\%#=2[^0-z]//g',
+    \ "0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz"]
+    \]
+
+  for [cmd, expected] in tests
+      call append(0, input)
+      call cursor(1, 1)
+      exe cmd
+      call assert_equal(expected, getline(1), cmd)
+  endfor
+
+  let &encoding = save_enc
+  enew!
+  close
+endfunc

src/testdir/test_ruby.vim

@@ -49,3 +49,11 @@ func Test_rubydo()
   bwipe!
   bwipe!
 endfunc
+
+func Test_rubyfile()
+  " Check :rubyfile does not SEGV with Ruby level exception but just fails
+  let tempfile = tempname() . '.rb'
+  call writefile(['raise "vim!"'], tempfile)
+  call assert_fails('rubyfile ' . tempfile)
+  call delete(tempfile)
+endfunc

src/testdir/test_shortpathname.vim

@@ -0,0 +1,70 @@
+" Test for shortpathname ':8' extension.
+" Only for use on Win32 systems!
+
+if !has('win32')
+  finish
+endif
+
+func TestIt(file, bits, expected)
+  let res = fnamemodify(a:file, a:bits)
+  if a:expected != ''
+    call assert_equal(substitute(a:expected, '/', '\\', 'g'),
+		\ substitute(res, '/', '\\', 'g'),
+		\ "'" . a:file . "'->(" . a:bits . ")->'" . res . "'")
+  endif
+endfunc
+
+func Test_ColonEight()
+  let save_dir = getcwd()
+
+  " This could change for CygWin to //cygdrive/c
+  let dir1 = 'c:/x.x.y'
+  if filereadable(dir1) || isdirectory(dir1)
+    call assert_report("Fatal: '" . dir1 . "' exists, cannot run test")
+    return
+  endif
+
+  let file1 = dir1 . '/zz.y.txt'
+  let nofile1 = dir1 . '/z.y.txt'
+  let dir2 = dir1 . '/VimIsTheGreatestSinceSlicedBread'
+  let file2 = dir2 . '/z.txt'
+  let nofile2 = dir2 . '/zz.txt'
+
+  call mkdir(dir1)
+  let resdir1 = substitute(fnamemodify(dir1, ':p:8'), '/$', '', '')
+  call assert_match('\V\^c:/XX\x\x\x\x~1.Y\$', resdir1)
+
+  let resfile1 = resdir1 . '/ZZY~1.TXT'
+  let resnofile1 = resdir1 . '/z.y.txt'
+  let resdir2 = resdir1 . '/VIMIST~1'
+  let resfile2 = resdir2 . '/z.txt'
+  let resnofile2 = resdir2 . '/zz.txt'
+
+  call mkdir(dir2)
+  call writefile([], file1)
+  call writefile([], file2)
+
+  call TestIt(file1, ':p:8', resfile1)
+  call TestIt(nofile1, ':p:8', resnofile1)
+  call TestIt(file2, ':p:8', resfile2)
+  call TestIt(nofile2, ':p:8', resnofile2)
+  call TestIt(nofile2, ':p:8:h', fnamemodify(resnofile2, ':h'))
+  exe 'cd ' . dir1
+  call TestIt(file1, ':.:8', strpart(resfile1, strlen(resdir1)+1))
+  call TestIt(nofile1, ':.:8', strpart(resnofile1, strlen(resdir1)+1))
+  call TestIt(file2, ':.:8', strpart(resfile2, strlen(resdir1)+1))
+  call TestIt(nofile2, ':.:8', strpart(resnofile2, strlen(resdir1)+1))
+  let $HOME=dir1
+  call TestIt(file1, ':~:8', '~' . strpart(resfile1, strlen(resdir1)))
+  call TestIt(nofile1, ':~:8', '~' . strpart(resnofile1, strlen(resdir1)))
+  call TestIt(file2, ':~:8', '~' . strpart(resfile2, strlen(resdir1)))
+  call TestIt(nofile2, ':~:8', '~' . strpart(resnofile2, strlen(resdir1)))
+
+  cd c:/
+  call delete(file2)
+  call delete(file1)
+  call delete(dir2, 'd')
+  call delete(dir1, 'd')
+
+  exe "cd " . save_dir
+endfunc

src/testdir/test_textformat.vim

@@ -166,3 +166,289 @@ func Test_text_format()
   setl ai& tw& fo& si& comments&
   enew!
 endfunc
+
+" Tests for :right, :center and :left on text with embedded TAB.
+func Test_format_align()
+  enew!
+  set tw=65
+
+  " :left alignment
+  call append(0, [
+	      \ "	test for :left",
+	      \ "	  a		a",
+	      \ "	    fa		a",
+	      \ "	  dfa		a",
+	      \ "	        sdfa		a",
+	      \ "	  asdfa		a",
+	      \ "	        xasdfa		a",
+	      \ "asxxdfa		a",
+	      \ ])
+  %left
+  call assert_equal([
+	      \ "test for :left",
+	      \ "a		a",
+	      \ "fa		a",
+	      \ "dfa		a",
+	      \ "sdfa		a",
+	      \ "asdfa		a",
+	      \ "xasdfa		a",
+	      \ "asxxdfa		a",
+	      \ ""
+	      \ ], getline(1, '$'))
+  enew!
+
+  " :center alignment
+  call append(0, [
+	      \ "	test for :center",
+	      \ "	  a		a",
+	      \ "	    fa		afd asdf",
+	      \ "	  dfa		a",
+	      \ "	        sdfa		afd asdf",
+	      \ "	  asdfa		a",
+	      \ "	        xasdfa		asdfasdfasdfasdfasdf",
+	      \ "asxxdfa		a"
+	      \ ])
+  %center
+  call assert_equal([
+	      \ "			test for :center",
+	      \ "			 a		a",
+	      \ "		      fa		afd asdf",
+	      \ "			 dfa		a",
+	      \ "		    sdfa		afd asdf",
+	      \ "			 asdfa		a",
+	      \ "	      xasdfa		asdfasdfasdfasdfasdf",
+	      \ "			asxxdfa		a",
+	      \ ""
+	      \ ], getline(1, '$'))
+  enew!
+
+  " :right alignment
+  call append(0, [
+	      \ "	test for :right",
+	      \ "	a		a",
+	      \ "	fa		a",
+	      \ "	dfa		a",
+	      \ "	sdfa		a",
+	      \ "	asdfa		a",
+	      \ "	xasdfa		a",
+	      \ "	asxxdfa		a",
+	      \ "	asxa;ofa		a",
+	      \ "	asdfaqwer		a",
+	      \ "	a		ax",
+	      \ "	fa		ax",
+	      \ "	dfa		ax",
+	      \ "	sdfa		ax",
+	      \ "	asdfa		ax",
+	      \ "	xasdfa		ax",
+	      \ "	asxxdfa		ax",
+	      \ "	asxa;ofa		ax",
+	      \ "	asdfaqwer		ax",
+	      \ "	a		axx",
+	      \ "	fa		axx",
+	      \ "	dfa		axx",
+	      \ "	sdfa		axx",
+	      \ "	asdfa		axx",
+	      \ "	xasdfa		axx",
+	      \ "	asxxdfa		axx",
+	      \ "	asxa;ofa		axx",
+	      \ "	asdfaqwer		axx",
+	      \ "	a		axxx",
+	      \ "	fa		axxx",
+	      \ "	dfa		axxx",
+	      \ "	sdfa		axxx",
+	      \ "	asdfa		axxx",
+	      \ "	xasdfa		axxx",
+	      \ "	asxxdfa		axxx",
+	      \ "	asxa;ofa		axxx",
+	      \ "	asdfaqwer		axxx",
+	      \ "	a		axxxo",
+	      \ "	fa		axxxo",
+	      \ "	dfa		axxxo",
+	      \ "	sdfa		axxxo",
+	      \ "	asdfa		axxxo",
+	      \ "	xasdfa		axxxo",
+	      \ "	asxxdfa		axxxo",
+	      \ "	asxa;ofa		axxxo",
+	      \ "	asdfaqwer		axxxo",
+	      \ "	a		axxxoi",
+	      \ "	fa		axxxoi",
+	      \ "	dfa		axxxoi",
+	      \ "	sdfa		axxxoi",
+	      \ "	asdfa		axxxoi",
+	      \ "	xasdfa		axxxoi",
+	      \ "	asxxdfa		axxxoi",
+	      \ "	asxa;ofa		axxxoi",
+	      \ "	asdfaqwer		axxxoi",
+	      \ "	a		axxxoik",
+	      \ "	fa		axxxoik",
+	      \ "	dfa		axxxoik",
+	      \ "	sdfa		axxxoik",
+	      \ "	asdfa		axxxoik",
+	      \ "	xasdfa		axxxoik",
+	      \ "	asxxdfa		axxxoik",
+	      \ "	asxa;ofa		axxxoik",
+	      \ "	asdfaqwer		axxxoik",
+	      \ "	a		axxxoike",
+	      \ "	fa		axxxoike",
+	      \ "	dfa		axxxoike",
+	      \ "	sdfa		axxxoike",
+	      \ "	asdfa		axxxoike",
+	      \ "	xasdfa		axxxoike",
+	      \ "	asxxdfa		axxxoike",
+	      \ "	asxa;ofa		axxxoike",
+	      \ "	asdfaqwer		axxxoike",
+	      \ "	a		axxxoikey",
+	      \ "	fa		axxxoikey",
+	      \ "	dfa		axxxoikey",
+	      \ "	sdfa		axxxoikey",
+	      \ "	asdfa		axxxoikey",
+	      \ "	xasdfa		axxxoikey",
+	      \ "	asxxdfa		axxxoikey",
+	      \ "	asxa;ofa		axxxoikey",
+	      \ "	asdfaqwer		axxxoikey",
+	      \ ])
+  %right
+  call assert_equal([
+	      \ "\t\t\t\t		  test for :right",
+	      \ "\t\t\t\t		      a		a",
+	      \ "\t\t\t\t		     fa		a",
+	      \ "\t\t\t\t		    dfa		a",
+	      \ "\t\t\t\t		   sdfa		a",
+	      \ "\t\t\t\t		  asdfa		a",
+	      \ "\t\t\t\t		 xasdfa		a",
+	      \ "\t\t\t\t		asxxdfa		a",
+	      \ "\t\t\t\t	       asxa;ofa		a",
+	      \ "\t\t\t\t	      asdfaqwer		a",
+	      \ "\t\t\t\t	      a		ax",
+	      \ "\t\t\t\t	     fa		ax",
+	      \ "\t\t\t\t	    dfa		ax",
+	      \ "\t\t\t\t	   sdfa		ax",
+	      \ "\t\t\t\t	  asdfa		ax",
+	      \ "\t\t\t\t	 xasdfa		ax",
+	      \ "\t\t\t\t	asxxdfa		ax",
+	      \ "\t\t\t\t       asxa;ofa		ax",
+	      \ "\t\t\t\t      asdfaqwer		ax",
+	      \ "\t\t\t\t	      a		axx",
+	      \ "\t\t\t\t	     fa		axx",
+	      \ "\t\t\t\t	    dfa		axx",
+	      \ "\t\t\t\t	   sdfa		axx",
+	      \ "\t\t\t\t	  asdfa		axx",
+	      \ "\t\t\t\t	 xasdfa		axx",
+	      \ "\t\t\t\t	asxxdfa		axx",
+	      \ "\t\t\t\t       asxa;ofa		axx",
+	      \ "\t\t\t\t      asdfaqwer		axx",
+	      \ "\t\t\t\t	      a		axxx",
+	      \ "\t\t\t\t	     fa		axxx",
+	      \ "\t\t\t\t	    dfa		axxx",
+	      \ "\t\t\t\t	   sdfa		axxx",
+	      \ "\t\t\t\t	  asdfa		axxx",
+	      \ "\t\t\t\t	 xasdfa		axxx",
+	      \ "\t\t\t\t	asxxdfa		axxx",
+	      \ "\t\t\t\t       asxa;ofa		axxx",
+	      \ "\t\t\t\t      asdfaqwer		axxx",
+	      \ "\t\t\t\t	      a		axxxo",
+	      \ "\t\t\t\t	     fa		axxxo",
+	      \ "\t\t\t\t	    dfa		axxxo",
+	      \ "\t\t\t\t	   sdfa		axxxo",
+	      \ "\t\t\t\t	  asdfa		axxxo",
+	      \ "\t\t\t\t	 xasdfa		axxxo",
+	      \ "\t\t\t\t	asxxdfa		axxxo",
+	      \ "\t\t\t\t       asxa;ofa		axxxo",
+	      \ "\t\t\t\t      asdfaqwer		axxxo",
+	      \ "\t\t\t\t	      a		axxxoi",
+	      \ "\t\t\t\t	     fa		axxxoi",
+	      \ "\t\t\t\t	    dfa		axxxoi",
+	      \ "\t\t\t\t	   sdfa		axxxoi",
+	      \ "\t\t\t\t	  asdfa		axxxoi",
+	      \ "\t\t\t\t	 xasdfa		axxxoi",
+	      \ "\t\t\t\t	asxxdfa		axxxoi",
+	      \ "\t\t\t\t       asxa;ofa		axxxoi",
+	      \ "\t\t\t\t      asdfaqwer		axxxoi",
+	      \ "\t\t\t\t	      a		axxxoik",
+	      \ "\t\t\t\t	     fa		axxxoik",
+	      \ "\t\t\t\t	    dfa		axxxoik",
+	      \ "\t\t\t\t	   sdfa		axxxoik",
+	      \ "\t\t\t\t	  asdfa		axxxoik",
+	      \ "\t\t\t\t	 xasdfa		axxxoik",
+	      \ "\t\t\t\t	asxxdfa		axxxoik",
+	      \ "\t\t\t\t       asxa;ofa		axxxoik",
+	      \ "\t\t\t\t      asdfaqwer		axxxoik",
+	      \ "\t\t\t\t	      a		axxxoike",
+	      \ "\t\t\t\t	     fa		axxxoike",
+	      \ "\t\t\t\t	    dfa		axxxoike",
+	      \ "\t\t\t\t	   sdfa		axxxoike",
+	      \ "\t\t\t\t	  asdfa		axxxoike",
+	      \ "\t\t\t\t	 xasdfa		axxxoike",
+	      \ "\t\t\t\t	asxxdfa		axxxoike",
+	      \ "\t\t\t\t       asxa;ofa		axxxoike",
+	      \ "\t\t\t\t      asdfaqwer		axxxoike",
+	      \ "\t\t\t\t	      a		axxxoikey",
+	      \ "\t\t\t\t	     fa		axxxoikey",
+	      \ "\t\t\t\t	    dfa		axxxoikey",
+	      \ "\t\t\t\t	   sdfa		axxxoikey",
+	      \ "\t\t\t\t	  asdfa		axxxoikey",
+	      \ "\t\t\t\t	 xasdfa		axxxoikey",
+	      \ "\t\t\t\t	asxxdfa		axxxoikey",
+	      \ "\t\t\t\t       asxa;ofa		axxxoikey",
+	      \ "\t\t\t\t      asdfaqwer		axxxoikey",
+	      \ ""
+	      \ ], getline(1, '$'))
+  enew!
+
+  set tw&
+endfunc
+
+" Test formatting a paragraph.
+func Test_format_para()
+  enew!
+  set fo+=tcroql tw=72
+
+  call append(0, [
+	\ "xxxxx xx xxxxxx ",
+	\ "xxxxxxx xxxxxxxxx xxx xxxx xxxxx xxxxx xxx xx",
+	\ "xxxxxxxxxxxxxxxxxx xxxxx xxxx, xxxx xxxx xxxx xxxx xxx xx xx",
+	\ "xx xxxxxxx. xxxx xxxx.",
+	\ "",
+	\ "> xx xx, xxxx xxxx xxx xxxx xxx xxxxx xxx xxx xxxxxxx xxx xxxxx",
+	\ "> xxxxxx xxxxxxx: xxxx xxxxxxx, xx xxxxxx xxxx xxxxxxxxxx"
+	\ ])
+  exe "normal /xxxxxxxx$\<CR>"
+  normal 0gq6kk
+  call assert_equal([
+	\ "xxxxx xx xxxxxx xxxxxxx xxxxxxxxx xxx xxxx xxxxx xxxxx xxx xx",
+	\ "xxxxxxxxxxxxxxxxxx xxxxx xxxx, xxxx xxxx xxxx xxxx xxx xx xx xx xxxxxxx.",
+	\ "xxxx xxxx.",
+	\ "",
+	\ "> xx xx, xxxx xxxx xxx xxxx xxx xxxxx xxx xxx xxxxxxx xxx xxxxx xxxxxx",
+	\ "> xxxxxxx: xxxx xxxxxxx, xx xxxxxx xxxx xxxxxxxxxx",
+	\ ""
+	\ ], getline(1, '$'))
+
+  set fo& tw&
+  enew!
+endfunc
+
+" Test undo after ":%s" and formatting.
+func Test_format_undo()
+  enew!
+  map gg :.,.+2s/^/x/<CR>kk:set tw=3<CR>gqq
+
+  call append(0, [
+	      \ "aa aa aa aa",
+	      \ "bb bb bb bb",
+	      \ "cc cc cc cc"
+	      \ ])
+  " undo/redo here to make the next undo only work on the following changes
+  exe "normal i\<C-G>u"
+  call cursor(1,1)
+  normal ggu
+  call assert_equal([
+	      \ "aa aa aa aa",
+	      \ "bb bb bb bb",
+	      \ "cc cc cc cc",
+	      \ ""
+	      \ ], getline(1, '$'))
+
+  unmap gg
+  enew!
+endfunc

src/ui.c

@@ -245,7 +245,7 @@ ui_wait_for_chars_or_timer(
 	if (interrupted != NULL && *interrupted)
 	    /* Nothing available, but need to return so that side effects get
 	     * handled, such as handling a message on a channel. */
-	    return FALSE;
+	    return FAIL;
 	if (wtime > 0)
 	    remaining -= due_time;
     }
@@ -578,11 +578,7 @@ clip_lose_selection(VimClipboard *cbd)
 	    update_curbuf(INVERTED_ALL);
 	    setcursor();
 	    cursor_on();
-	    out_flush();
-# ifdef FEAT_GUI
-	    if (gui.in_use)
-		gui_update_cursor(TRUE, FALSE);
-# endif
+	    out_flush_cursor(TRUE, FALSE);
 	}
     }
 #endif
@@ -3331,13 +3327,10 @@ ui_focus_change(
 	    setcursor();
 	}
 	cursor_on();	    /* redrawing may have switched it off */
-	out_flush();
+	out_flush_cursor(FALSE, TRUE);
 # ifdef FEAT_GUI
 	if (gui.in_use)
-	{
-	    gui_update_cursor(FALSE, TRUE);
 	    gui_update_scrollbars(FALSE);
-	}
 # endif
     }
 #ifdef FEAT_TITLE

src/version.c

@@ -771,6 +771,12 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1449,
+/**/
+    1448,
+/**/
+    1447,
 /**/
     1446,
 /**/