diff options
| -rw-r--r-- | runtime/doc/options.txt | 4 | ||||
| -rw-r--r-- | src/errors.h | 2 | ||||
| -rw-r--r-- | src/gui.c | 6 | ||||
| -rw-r--r-- | src/gui.h | 4 | ||||
| -rw-r--r-- | src/option.h | 2 | ||||
| -rw-r--r-- | src/optiondefs.h | 2 | ||||
| -rw-r--r-- | src/optionstr.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_gui.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
9 files changed, 15 insertions, 11 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 78cac3f33a..b70fb15d98 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 9.1. Last change: 2024 Jan 30 +*options.txt* For Vim version 9.1. Last change: 2024 Feb 24 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4000,7 +4000,7 @@ A jump table for the options with a short description can be found at |Q_op|. *'guiligatures'* *'gli'* *E1243* 'guiligatures' 'gli' string (default "") global - {only for GTK GUI} + {only for GTK and Win32 GUI} List of ASCII characters that, when combined together, can create more complex shapes. Each character must be a printable ASCII character with a value in the 32-127 range. diff --git a/src/errors.h b/src/errors.h index 00994312bb..dd2bc95b76 100644 --- a/src/errors.h +++ b/src/errors.h @@ -3185,7 +3185,7 @@ EXTERN char e_separator_not_supported_str[] EXTERN char e_no_white_space_allowed_before_separator_str[] INIT(= N_("E1242: No white space allowed before separator: %s")); #endif -#ifdef FEAT_GUI_GTK +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) EXTERN char e_ascii_code_not_in_range[] INIT(= N_("E1243: ASCII code not in 32-127 range")); #endif @@ -455,7 +455,7 @@ gui_init_check(void) gui.scrollbar_width = gui.scrollbar_height = SB_DEFAULT_WIDTH; gui.prev_wrap = -1; -#ifdef FEAT_GUI_GTK +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) CLEAR_FIELD(gui.ligatures_map); #endif @@ -1064,7 +1064,7 @@ gui_get_wide_font(void) return OK; } -#if defined(FEAT_GUI_GTK) || defined(PROTO) +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) || defined(PROTO) /* * Set list of ascii characters that combined can create ligature. * Store them in char map for quick access from gui_gtk2_draw_string. @@ -2691,7 +2691,7 @@ gui_undraw_cursor(void) int startcol = gui.cursor_col > 0 ? gui.cursor_col - 1 : gui.cursor_col; int endcol = gui.cursor_col; -#ifdef FEAT_GUI_GTK +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) gui_adjust_undraw_cursor_for_ligatures(&startcol, &endcol); #endif gui_redraw_block(gui.cursor_row, startcol, @@ -389,10 +389,12 @@ typedef struct Gui char_u *browse_fname; // file name from filedlg guint32 event_time; +#endif // FEAT_GUI_GTK +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) char_u ligatures_map[256]; // ascii map for characters 0-255, value is // 1 if in 'guiligatures' -#endif // FEAT_GUI_GTK +#endif #if defined(FEAT_GUI_TABLINE) \ && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) \ diff --git a/src/option.h b/src/option.h index 28a4a96b41..75940cce0a 100644 --- a/src/option.h +++ b/src/option.h @@ -637,7 +637,7 @@ EXTERN char_u *p_guifontset; // 'guifontset' EXTERN char_u *p_guifontwide; // 'guifontwide' EXTERN int p_guipty; // 'guipty' #endif -#ifdef FEAT_GUI_GTK +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) EXTERN char_u *p_guiligatures; // 'guiligatures' # endif #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11) diff --git a/src/optiondefs.h b/src/optiondefs.h index 776858804d..1a09e1c7fb 100644 --- a/src/optiondefs.h +++ b/src/optiondefs.h @@ -1212,7 +1212,7 @@ static struct vimoption options[] = {(char_u *)50L, (char_u *)0L} SCTX_INIT}, {"guiligatures", "gli", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA|P_NODUP, -#if defined(FEAT_GUI_GTK) +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) (char_u *)&p_guiligatures, PV_NONE, did_set_guiligatures, NULL, {(char_u *)"", (char_u *)0L} diff --git a/src/optionstr.c b/src/optionstr.c index 8b000abbb4..457fccb1eb 100644 --- a/src/optionstr.c +++ b/src/optionstr.c @@ -2438,7 +2438,7 @@ did_set_guifontwide(optset_T *args UNUSED) } #endif -#if defined(FEAT_GUI_GTK) || defined(PROTO) +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) || defined(PROTO) /* * The 'guiligatures' option is changed. */ diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index dbf1d3b310..2ff8d3400b 100644 --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -635,7 +635,7 @@ endfunc func Test_set_guiligatures() CheckX11BasedGui - if has('gui_gtk') || has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3') + if has('gui_gtk') || has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3') || has('win32') " Try correct value set guiligatures=<>=ab call assert_equal("<>=ab", &guiligatures) diff --git a/src/version.c b/src/version.c index 59a940ba09..1405854d80 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 133, +/**/ 132, /**/ 131, |