Skip to content

Commit d32a265

Browse files
Drew Vogelchrisbra
authored andcommitted
patch 9.1.1903: GTK naming still reflects GTK1 support
Problem: GTK naming still reflects GTK1 support Solution: Rename to avoid confusion (Drew Vogel) related: #18708 Signed-off-by: Drew Vogel <dvogel@github> Signed-off-by: Christian Brabandt <[email protected]>
1 parent 20ccdc7 commit d32a265

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/gui_gtk_x11.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5185,7 +5185,7 @@ static PangoEngineShape *default_shape_engine = NULL;
51855185

51865186
/*
51875187
* Create a map from ASCII characters in the range [32,126] to glyphs
5188-
* of the current font. This is used by gui_gtk2_draw_string() to skip
5188+
* of the current font. This is used by gui_gtk_draw_string() to skip
51895189
* the itemize and shaping process for the most common case.
51905190
*/
51915191
static void
@@ -5900,7 +5900,7 @@ draw_under(int flags, int row, int col, int cells)
59005900
}
59015901

59025902
int
5903-
gui_gtk2_draw_string(int row, int col, char_u *s, int len, int flags)
5903+
gui_gtk_draw_string(int row, int col, char_u *s, int len, int flags)
59045904
{
59055905
char_u *conv_buf = NULL; // result of UTF-8 conversion
59065906
char_u *new_conv_buf;
@@ -6062,8 +6062,8 @@ gui_gtk2_draw_string(int row, int col, char_u *s, int len, int flags)
60626062
backup_ch = *(cs + slen);
60636063
*(cs + slen) = NUL;
60646064
}
6065-
len_sum += gui_gtk2_draw_string_ext(row, col + len_sum,
6066-
cs, slen, flags, needs_pango);
6065+
len_sum += gui_gtk_draw_string_ext(row, col + len_sum, cs, slen, flags,
6066+
needs_pango);
60676067
if (slen < len)
60686068
*(cs + slen) = backup_ch;
60696069
cs += slen;
@@ -6075,7 +6075,7 @@ gui_gtk2_draw_string(int row, int col, char_u *s, int len, int flags)
60756075
}
60766076

60776077
int
6078-
gui_gtk2_draw_string_ext(
6078+
gui_gtk_draw_string_ext(
60796079
int row,
60806080
int col,
60816081
char_u *s,

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,8 @@ static char *(features[]) =
729729

730730
static int included_patches[] =
731731
{ /* Add new patch number below this line */
732+
/**/
733+
1903,
732734
/**/
733735
1902,
734736
/**/

0 commit comments

Comments
 (0)