diff options
| author | Josh Rahm <rahm@google.com> | 2022-07-18 19:37:18 +0000 |
|---|---|---|
| committer | Josh Rahm <rahm@google.com> | 2022-07-18 19:37:18 +0000 |
| commit | 308e1940dcd64aa6c344c403d4f9e0dda58d9c5c (patch) | |
| tree | 35fe43e01755e0f312650667004487a44d6b7941 /src/nvim/ascii.h | |
| parent | 96a00c7c588b2f38a2424aeeb4ea3581d370bf2d (diff) | |
| parent | e8c94697bcbe23a5c7b07c292b90a6b70aadfa87 (diff) | |
| download | rneovim-308e1940dcd64aa6c344c403d4f9e0dda58d9c5c.tar.gz rneovim-308e1940dcd64aa6c344c403d4f9e0dda58d9c5c.tar.bz2 rneovim-308e1940dcd64aa6c344c403d4f9e0dda58d9c5c.zip | |
Merge remote-tracking branch 'upstream/master' into rahm
Diffstat (limited to 'src/nvim/ascii.h')
| -rw-r--r-- | src/nvim/ascii.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/nvim/ascii.h b/src/nvim/ascii.h index 2cabaa43ef..b1241166bf 100644 --- a/src/nvim/ascii.h +++ b/src/nvim/ascii.h @@ -9,11 +9,11 @@ // Definitions of various common control characters. -#define CharOrd(x) ((uint8_t)(x) < 'a' \ - ? (uint8_t)(x) - 'A' \ - : (uint8_t)(x) - 'a') -#define CharOrdLow(x) ((uint8_t)(x) - 'a') -#define CharOrdUp(x) ((uint8_t)(x) - 'A') +#define CHAR_ORD(x) ((uint8_t)(x) < 'a' \ + ? (uint8_t)(x) - 'A' \ + : (uint8_t)(x) - 'a') +#define CHAR_ORD_LOW(x) ((uint8_t)(x) - 'a') +#define CHAR_ORD_UP(x) ((uint8_t)(x) - 'A') #define ROT13(c, a) (((((c) - (a)) + 13) % 26) + (a)) #define NUL '\000' @@ -35,8 +35,8 @@ #define POUND 0xA3 -#define Ctrl_chr(x) (TOUPPER_ASC(x) ^ 0x40) // '?' -> DEL, '@' -> ^@, etc. -#define Meta(x) ((x) | 0x80) +#define CTRL_CHR(x) (TOUPPER_ASC(x) ^ 0x40) // '?' -> DEL, '@' -> ^@, etc. +#define META(x) ((x) | 0x80) #define CTRL_F_STR "\006" #define CTRL_H_STR "\010" @@ -75,7 +75,6 @@ #define Ctrl_HAT 30 // ^ #define Ctrl__ 31 - // Character that separates dir names in a path. #ifdef BACKSLASH_IN_FILENAME # define PATHSEP psepc |