mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-17 00:38:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

option_defs.h: Introduce SHM_ABBREVIATIONS

Browse Source 
Helped-by: ZyX <kp-pav@yandex.ru>
This commit is contained in:
watiko
2016-02-16 02:26:06 +09:00
parent 5b63488c25
commit 0d6cd2b808
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/option.c
View File

@@ -6163,16 +6163,14 @@ int has_format_option(int x)
return vim_strchr(curbuf->b_p_fo, x) != NULL; return vim_strchr(curbuf->b_p_fo, x) != NULL;
} }
/* /// @returns true if "x" is present in 'shortmess' option, or
* Return TRUE if "x" is present in 'shortmess' option, or /// 'shortmess' contains 'a' and "x" is present in SHM_ALL_ABBREVIATIONS.
* 'shortmess' contains 'a' and "x" is present in SHM_A. bool shortmess(int x)
*/
int shortmess(int x)
{ {
return p_shm != NULL && return p_shm != NULL &&
( vim_strchr(p_shm, x) != NULL (vim_strchr(p_shm, x) != NULL
|| (vim_strchr(p_shm, 'a') != NULL || (vim_strchr(p_shm, 'a') != NULL
&& vim_strchr((char_u *)SHM_A, x) != NULL)); && vim_strchr((char_u *)SHM_ALL_ABBREVIATIONS, x) != NULL));
} }
/* /*

8
src/nvim/option_defs.h
View File

@@ -161,6 +161,7 @@ enum {
SHM_LINES = 'l', ///< "L" instead of "lines". SHM_LINES = 'l', ///< "L" instead of "lines".
SHM_NEW = 'n', ///< "[New]" instead of "[New file]". SHM_NEW = 'n', ///< "[New]" instead of "[New file]".
SHM_WRI = 'w', ///< "[w]" instead of "written". SHM_WRI = 'w', ///< "[w]" instead of "written".
SHM_ABBREVIATIONS = 'a', ///< Use abbreviations from #SHM_ALL_ABBREVIATIONS.
SHM_WRITE = 'W', ///< Don't use "written" at all. SHM_WRITE = 'W', ///< Don't use "written" at all.
SHM_TRUNC = 't', ///< Trunctate file messages. SHM_TRUNC = 't', ///< Trunctate file messages.
SHM_TRUNCALL = 'T', ///< Trunctate all messages. SHM_TRUNCALL = 'T', ///< Trunctate all messages.
@@ -173,15 +174,16 @@ enum {
SHM_RECORDING = 'q', ///< Short recording message. SHM_RECORDING = 'q', ///< Short recording message.
}; };
/// Represented by 'a' flag. /// Represented by 'a' flag.
#define SHM_A ((char_u[]) { \ #define SHM_ALL_ABBREVIATIONS ((char_u[]) { \
SHM_RO, SHM_MOD, SHM_FILE, SHM_LAST, SHM_TEXT, SHM_LINES, SHM_NEW, SHM_WRI, \ SHM_RO, SHM_MOD, SHM_FILE, SHM_LAST, SHM_TEXT, SHM_LINES, SHM_NEW, SHM_WRI, \
0, \ 0, \
}) })
/// All possible flags for 'shm'. /// All possible flags for 'shm'.
#define SHM_ALL ((char_u[]) { \ #define SHM_ALL ((char_u[]) { \
SHM_RO, SHM_MOD, SHM_FILE, SHM_LAST, SHM_TEXT, SHM_LINES, SHM_NEW, SHM_WRI, \ SHM_RO, SHM_MOD, SHM_FILE, SHM_LAST, SHM_TEXT, SHM_LINES, SHM_NEW, SHM_WRI, \
'a', SHM_WRITE, SHM_TRUNC, SHM_TRUNCALL, SHM_OVER, SHM_OVERALL, SHM_SEARCH, \ SHM_ABBREVIATIONS, SHM_WRITE, SHM_TRUNC, SHM_TRUNCALL, SHM_OVER, \
SHM_ATTENTION, SHM_INTRO, SHM_COMPLETIONMENU, SHM_RECORDING, \ SHM_OVERALL, SHM_SEARCH, SHM_ATTENTION, SHM_INTRO, SHM_COMPLETIONMENU, \
SHM_RECORDING, \
0, \ 0, \
}) })