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 <cb@256bit.org>

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 2b310ab3b64110216e0e339ff899e82dc518ed2c..4b586c947865341a9112a044aa4d9812c9568351 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -5185,7 +5185,7 @@ static PangoEngineShape *default_shape_engine = NULL;
 
 /*
  * Create a map from ASCII characters in the range [32,126] to glyphs
- * of the current font.  This is used by gui_gtk2_draw_string() to skip
+ * of the current font.  This is used by gui_gtk_draw_string() to skip
  * the itemize and shaping process for the most common case.
  */
     static void
@@ -5900,7 +5900,7 @@ draw_under(int flags, int row, int col, int cells)
 }
 
     int
-gui_gtk2_draw_string(int row, int col, char_u *s, int len, int flags)
+gui_gtk_draw_string(int row, int col, char_u *s, int len, int flags)
 {
     char_u     *conv_buf = NULL;   // result of UTF-8 conversion
     char_u     *new_conv_buf;
@@ -6062,8 +6062,8 @@ gui_gtk2_draw_string(int row, int col, char_u *s, int len, int flags)
            backup_ch = *(cs + slen);
            *(cs + slen) = NUL;
        }
-       len_sum += gui_gtk2_draw_string_ext(row, col + len_sum,
-                                                cs, slen, flags, needs_pango);
+       len_sum += gui_gtk_draw_string_ext(row, col + len_sum, cs, slen, flags,
+                                          needs_pango);
        if (slen < len)
            *(cs + slen) = backup_ch;
        cs += slen;
@@ -6075,7 +6075,7 @@ gui_gtk2_draw_string(int row, int col, char_u *s, int len, int flags)
 }
 
     int
-gui_gtk2_draw_string_ext(
+gui_gtk_draw_string_ext(
        int     row,
        int     col,
        char_u  *s,

diff --git a/src/version.c b/src/version.c
index 743af8af9a8a4bea292e8cbc6b0ad4e9fc4d8e87..ec5a646aa519f84014a0477e427c9bcf9fde0905 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1903,
 /**/
     1902,
 /**/