diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:05:19 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:05:19 +0000 |
| commit | a4e9136f68a40b1cb0eb6df5a5f06603224a87f4 (patch) | |
| tree | ba32e0d0069ad6adfd6b32d05161a03eea5e4c7c /src/vim.h | |
| parent | Releasing progress-linux version 2:9.1.0496-1~progress7.99u1. (diff) | |
| download | vim-a4e9136f68a40b1cb0eb6df5a5f06603224a87f4.tar.xz vim-a4e9136f68a40b1cb0eb6df5a5f06603224a87f4.zip | |
Merging upstream version 2:9.1.0698.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/vim.h')
| -rw-r--r-- | src/vim.h | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -598,7 +598,7 @@ extern int (*dyn_libintl_wputenv)(const wchar_t *envstring); # ifdef bindtextdomain # undef bindtextdomain # endif -# define bindtextdomain(x, y) // empty +# define bindtextdomain(x, y) "" # ifdef bind_textdomain_codeset # undef bind_textdomain_codeset # endif @@ -843,6 +843,8 @@ extern int (*dyn_libintl_wputenv)(const wchar_t *envstring); #define EXPAND_ARGOPT 56 #define EXPAND_TERMINALOPT 57 #define EXPAND_KEYMAP 58 +#define EXPAND_DIRS_IN_CDPATH 59 + // Values for exmode_active (0 is no exmode) #define EXMODE_NORMAL 1 @@ -898,6 +900,7 @@ extern int (*dyn_libintl_wputenv)(const wchar_t *envstring); #define EW_DODOT 0x4000 // also files starting with a dot #define EW_EMPTYOK 0x8000 // no matches is not an error #define EW_NOTENV 0x10000 // do not expand environment variables +#define EW_CDPATH 0x20000 // search in 'cdpath' too // Flags for find_file_*() functions. #define FINDFILE_FILE 0 // only files @@ -1074,6 +1077,8 @@ extern int (*dyn_libintl_wputenv)(const wchar_t *envstring); // Values for flags argument of do_buffer() #define DOBUF_FORCEIT 1 // :cmd! #define DOBUF_NOPOPUP 2 // skip popup window buffers +#define DOBUF_SKIPHELP 4 // skip or keep help buffers depending on b_help of the + // starting buffer // Values for sub_cmd and which_pat argument for search_regcomp() // Also used for which_pat argument for searchit() @@ -1361,6 +1366,7 @@ enum auto_event EVENT_CURSORHOLD, // cursor in same position for a while EVENT_CURSORHOLDI, // idem, in Insert mode EVENT_CURSORMOVED, // cursor was moved + EVENT_CURSORMOVEDC, // cursor was moved in Command line mode EVENT_CURSORMOVEDI, // cursor was moved in Insert mode EVENT_DIFFUPDATED, // after diffs were updated EVENT_DIRCHANGED, // after user changed directory @@ -1394,6 +1400,7 @@ enum auto_event EVENT_INSERTENTER, // when entering Insert mode EVENT_INSERTLEAVEPRE, // just before leaving Insert mode EVENT_INSERTLEAVE, // just after leaving Insert mode + EVENT_KEYINPUTPRE, // before key input EVENT_MENUPOPUP, // just before popup menu is displayed EVENT_MODECHANGED, // after changing the mode EVENT_OPTIONSET, // option was set @@ -1762,6 +1769,7 @@ void *vim_memset(void *, int, size_t); # define MB_STRICMP(d, s) mb_strnicmp((char_u *)(d), (char_u *)(s), (int)MAXCOL) # define MB_STRNICMP(d, s, n) mb_strnicmp((char_u *)(d), (char_u *)(s), (int)(n)) +# define MB_STRNICMP2(d, s, n1, n2) mb_strnicmp2((char_u *)(d), (char_u *)(s), (n1), (n2)) #define STRCAT(d, s) strcat((char *)(d), (char *)(s)) #define STRNCAT(d, s, n) strncat((char *)(d), (char *)(s), (size_t)(n)) |