Commit: 3135855c0dac94290ed6b3af9342490f056c345c - vim-ktakata-mq (hg)

K.Takata's patch queue for Vim

Commit MetaInfo

• Revisión: 3135855c0dac94290ed6b3af9342490f056c345c (tree)
• Tiempo: 2019-12-02 22:17:43
• Autor: K.Takata <kentkt@csc....>
• Commiter: K.Takata

Log Message

Update patches

Do qrefresh.

Cambiar Resumen

• modified: debug-enable-Trace-also-on-release-build.patch
• modified: fix-italic-overhang-before-space.patch
• modified: subpixel-artifacts.patch

Diferencia incremental

diff -r 3fa1eb61ab05 -r 3135855c0dac debug-enable-Trace-also-on-release-build.patch
--- a/debug-enable-Trace-also-on-release-build.patch	Mon Dec 02 08:26:20 2019 +0900
+++ b/debug-enable-Trace-also-on-release-build.patch	Mon Dec 02 22:17:43 2019 +0900
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent  3cc0ddf2abd0c4d56eba36b8e70f10b5bdcde45e
+# Parent  9dd7e4c50a52e0be614e5eea0abad8a466599f5d
 
 diff --git a/src/os_mswin.c b/src/os_mswin.c
 --- a/src/os_mswin.c
 +++ b/src/os_mswin.c
 @@ -936,7 +936,7 @@ DumpPutS(const char *psz UNUSED)
- # endif
+ #endif
  }
  
 -#ifdef _DEBUG

diff -r 3fa1eb61ab05 -r 3135855c0dac fix-italic-overhang-before-space.patch
--- a/fix-italic-overhang-before-space.patch	Mon Dec 02 08:26:20 2019 +0900
+++ b/fix-italic-overhang-before-space.patch	Mon Dec 02 22:17:43 2019 +0900
@@ -1,10 +1,12 @@
 # HG changeset patch
 # Parent 0d562ac6a11939a577c936226c816a3387acbd03
+# Parent  b9914cb1a5ac71fc1bd958f948b766867cb0d35c
+
 diff --git a/src/gui.c b/src/gui.c
 --- a/src/gui.c
 +++ b/src/gui.c
-@@ -2706,7 +2706,11 @@
- 	 * is.  Needed for when the bold trick is used */
+@@ -2742,7 +2742,11 @@ gui_redraw_block(
+ 	// is.  Needed for when the bold trick is used
  	for (back = 0; back < col1; ++back)
  	    if (ScreenAttrs[off - 1 - back] != ScreenAttrs[off]
 -		    || ScreenLines[off - 1 - back] == ' ')

diff -r 3fa1eb61ab05 -r 3135855c0dac subpixel-artifacts.patch
--- a/subpixel-artifacts.patch	Mon Dec 02 08:26:20 2019 +0900
+++ b/subpixel-artifacts.patch	Mon Dec 02 22:17:43 2019 +0900
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent  fc237c293646f97bc151228da42b5bf103881b03
+# Parent  4f8ee84ee4ec439498fc89ea9700999ea0ca5240
 
 diff --git a/src/screen.c b/src/screen.c
 --- a/src/screen.c
 +++ b/src/screen.c
-@@ -6324,6 +6324,10 @@ screen_line(
+@@ -420,6 +420,10 @@ screen_line(
      int		    char_cells;		/* 1: normal char */
  					/* 2: occupies two display cells */
  # define CHAR_CELLS char_cells
@@ -15,8 +15,8 @@
  
      /* Check for illegal row and col, just in case. */
      if (row >= Rows)
-@@ -6365,6 +6369,9 @@ screen_line(
- #endif /* FEAT_RIGHTLEFT */
+@@ -473,6 +477,9 @@ screen_line(
+ #endif
  
      redraw_next = char_needs_redraw(off_from, off_to, endcol - col);
 +#ifdef FEAT_GUI
@@ -25,7 +25,7 @@
  
      while (col < endcol)
      {
-@@ -6375,21 +6382,18 @@ screen_line(
+@@ -483,21 +490,18 @@ screen_line(
  
  	redraw_this = redraw_next;
  	redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS,
@@ -54,9 +54,9 @@
 -	}
 +	    redraw_this = TRUE;
  #endif
- #ifdef FEAT_TEXT_PROP
+ #ifdef FEAT_PROP_POPUP
  	if (blocked_by_popup(row, col + coloff))
-@@ -6521,6 +6525,11 @@ screen_line(
+@@ -629,6 +633,11 @@ screen_line(
  		    redraw_next = TRUE;
  	    }
  #endif