Patch 8.2.4402
7 views
Skip to first unread message
Bram Moolenaar
Feb 16, 2022, 2:24:46 PM2/16/22
to vim...@googlegroups.com
Patch 8.2.4402
Problem: Missing parenthesis may cause unexpected problems.
Solution: Add more parenthesis is macros. (closes #9788)
Files: src/autocmd.c, src/charset.c, src/drawline.c, src/drawscreen.c,
src/evalfunc.c, src/fileio.c, src/fold.c, src/getchar.c,
src/highlight.c, src/memline.c, src/normal.c, src/quickfix.c,
src/regexp.c, src/search.c, src/sha256.c, src/spell.c,
src/spellfile.c, src/spellsuggest.c, src/syntax.c, src/window.c
*** ../vim-8.2.4401/src/autocmd.c 2022-02-11 16:30:07.320908533 +0000
--- src/autocmd.c 2022-02-16 19:17:35.846185022 +0000
***************
*** 217,225 ****
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
};
! #define AUGROUP_DEFAULT -1 // default autocmd group
! #define AUGROUP_ERROR -2 // erroneous autocmd group
! #define AUGROUP_ALL -3 // all autocmd groups
/*
* struct used to keep status while executing autocommands for an event.
--- 217,225 ----
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
};
! #define AUGROUP_DEFAULT (-1) // default autocmd group
! #define AUGROUP_ERROR (-2) // erroneous autocmd group
! #define AUGROUP_ALL (-3) // all autocmd groups
/*
* struct used to keep status while executing autocommands for an event.
*** ../vim-8.2.4401/src/charset.c 2022-01-31 14:59:33.510943820 +0000
--- src/charset.c 2022-02-16 19:17:35.846185022 +0000
***************
*** 386,394 ****
int len = orglen;
#define GA_CHAR(i) ((char_u *)ga.ga_data)[i]
! #define GA_PTR(i) ((char_u *)ga.ga_data + i)
#define STR_CHAR(i) (buf == NULL ? GA_CHAR(i) : buf[i])
! #define STR_PTR(i) (buf == NULL ? GA_PTR(i) : buf + i)
// Copy "str" into "buf" or allocated memory, unmodified.
if (buf == NULL)
--- 386,394 ----
int len = orglen;
#define GA_CHAR(i) ((char_u *)ga.ga_data)[i]
! #define GA_PTR(i) ((char_u *)ga.ga_data + (i))
#define STR_CHAR(i) (buf == NULL ? GA_CHAR(i) : buf[i])
! #define STR_PTR(i) (buf == NULL ? GA_PTR(i) : buf + (i))
// Copy "str" into "buf" or allocated memory, unmodified.
if (buf == NULL)
***************
*** 706,712 ****
#ifdef FEAT_VARTABS
# define RET_WIN_BUF_CHARTABSIZE(wp, buf, p, col) \
! if (*(p) == TAB && (!(wp)->w_p_list || wp->w_lcs_chars.tab1)) \
{ \
return tabstop_padding(col, (buf)->b_p_ts, (buf)->b_p_vts_array); \
} \
--- 706,712 ----
#ifdef FEAT_VARTABS
# define RET_WIN_BUF_CHARTABSIZE(wp, buf, p, col) \
! if (*(p) == TAB && (!(wp)->w_p_list || (wp)->w_lcs_chars.tab1)) \
{ \
return tabstop_padding(col, (buf)->b_p_ts, (buf)->b_p_vts_array); \
} \
*** ../vim-8.2.4401/src/drawline.c 2022-01-29 15:19:19.542172491 +0000
--- src/drawline.c 2022-02-16 19:17:35.846185022 +0000
***************
*** 404,435 ****
// draw_state: items that are drawn in sequence:
#define WL_START 0 // nothing done yet
#ifdef FEAT_CMDWIN
! # define WL_CMDLINE WL_START + 1 // cmdline window column
#else
# define WL_CMDLINE WL_START
#endif
#ifdef FEAT_FOLDING
! # define WL_FOLD WL_CMDLINE + 1 // 'foldcolumn'
#else
# define WL_FOLD WL_CMDLINE
#endif
#ifdef FEAT_SIGNS
! # define WL_SIGN WL_FOLD + 1 // column for signs
#else
# define WL_SIGN WL_FOLD // column for signs
#endif
! #define WL_NR WL_SIGN + 1 // line number
#ifdef FEAT_LINEBREAK
! # define WL_BRI WL_NR + 1 // 'breakindent'
#else
# define WL_BRI WL_NR
#endif
#if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF)
! # define WL_SBR WL_BRI + 1 // 'showbreak' or 'diff'
#else
# define WL_SBR WL_BRI
#endif
! #define WL_LINE WL_SBR + 1 // text in the line
int draw_state = WL_START; // what to draw next
#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
int feedback_col = 0;
--- 404,435 ----
// draw_state: items that are drawn in sequence:
#define WL_START 0 // nothing done yet
#ifdef FEAT_CMDWIN
! # define WL_CMDLINE (WL_START + 1) // cmdline window column
#else
# define WL_CMDLINE WL_START
#endif
#ifdef FEAT_FOLDING
! # define WL_FOLD (WL_CMDLINE + 1) // 'foldcolumn'
#else
# define WL_FOLD WL_CMDLINE
#endif
#ifdef FEAT_SIGNS
! # define WL_SIGN (WL_FOLD + 1) // column for signs
#else
# define WL_SIGN WL_FOLD // column for signs
#endif
! #define WL_NR (WL_SIGN + 1) // line number
#ifdef FEAT_LINEBREAK
! # define WL_BRI (WL_NR + 1) // 'breakindent'
#else
# define WL_BRI WL_NR
#endif
#if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF)
! # define WL_SBR (WL_BRI + 1) // 'showbreak' or 'diff'
#else
# define WL_SBR WL_BRI
#endif
! #define WL_LINE (WL_SBR + 1) // text in the line
int draw_state = WL_START; // what to draw next
#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
int feedback_col = 0;
*** ../vim-8.2.4401/src/drawscreen.c 2022-02-14 19:17:25.220143635 +0000
--- src/drawscreen.c 2022-02-16 19:17:35.846185022 +0000
***************
*** 1112,1121 ****
# define RL_MEMSET(p, v, l) \
do { \
if (wp->w_p_rl) \
! for (ri = 0; ri < l; ++ri) \
ScreenAttrs[off + (wp->w_width - (p) - (l)) + ri] = v; \
else \
! for (ri = 0; ri < l; ++ri) \
ScreenAttrs[off + (p) + ri] = v; \
} while (0)
#else
--- 1112,1121 ----
# define RL_MEMSET(p, v, l) \
do { \
if (wp->w_p_rl) \
! for (ri = 0; ri < (l); ++ri) \
ScreenAttrs[off + (wp->w_width - (p) - (l)) + ri] = v; \
else \
! for (ri = 0; ri < (l); ++ri) \
ScreenAttrs[off + (p) + ri] = v; \
} while (0)
#else
*** ../vim-8.2.4401/src/evalfunc.c 2022-02-13 21:51:02.392484124 +0000
--- src/evalfunc.c 2022-02-16 19:17:35.850185015 +0000
***************
*** 7878,7898 ****
*x = vim_time();
}
! #define ROTL(x, k) ((x << k) | (x >> (32 - k)))
#define SPLITMIX32(x, z) ( \
! z = (x += 0x9e3779b9), \
! z = (z ^ (z >> 16)) * 0x85ebca6b, \
! z = (z ^ (z >> 13)) * 0xc2b2ae35, \
! z ^ (z >> 16) \
)
#define SHUFFLE_XOSHIRO128STARSTAR(x, y, z, w) \
! result = ROTL(y * 5, 7) * 9; \
! t = y << 9; \
! z ^= x; \
! w ^= y; \
! y ^= z, x ^= w; \
! z ^= t; \
! w = ROTL(w, 11);
/*
* "rand()" function
--- 7878,7898 ----
*x = vim_time();
}
! #define ROTL(x, k) (((x) << (k)) | ((x) >> (32 - (k))))
#define SPLITMIX32(x, z) ( \
! (z) = ((x) += 0x9e3779b9), \
! (z) = ((z) ^ ((z) >> 16)) * 0x85ebca6b, \
! (z) = ((z) ^ ((z) >> 13)) * 0xc2b2ae35, \
! (z) ^ ((z) >> 16) \
)
#define SHUFFLE_XOSHIRO128STARSTAR(x, y, z, w) \
! result = ROTL((y) * 5, 7) * 9; \
! t = (y) << 9; \
! (z) ^= (x); \
! (w) ^= (y); \
! (y) ^= (z), (x) ^= (w); \
! (z) ^= t; \
! (w) = ROTL(w, 11);
/*
* "rand()" function
*** ../vim-8.2.4401/src/fileio.c 2022-02-11 15:12:06.049929457 +0000
--- src/fileio.c 2022-02-16 19:17:35.850185015 +0000
***************
*** 4799,4805 ****
# ifdef FEAT_EVAL
# define FREE_ITEM(item) do { \
if (withattr) \
! dict_unref((dict_T*)item); \
else \
vim_free(item); \
} while (0)
--- 4799,4805 ----
# ifdef FEAT_EVAL
# define FREE_ITEM(item) do { \
if (withattr) \
! dict_unref((dict_T*)(item)); \
else \
vim_free(item); \
} while (0)
*** ../vim-8.2.4401/src/fold.c 2022-02-15 19:15:19.014817074 +0000
--- src/fold.c 2022-02-16 19:17:35.850185015 +0000
***************
*** 3066,3072 ****
#define fold_end(fp) ((fp)->fd_top + (fp)->fd_len - 1)
#define valid_fold(fp, gap) ((gap)->ga_len > 0 && (fp) < ((fold_T *)(gap)->ga_data + (gap)->ga_len))
! #define fold_index(fp, gap) ((size_t)(fp - ((fold_T *)(gap)->ga_data)))
void
foldMoveRange(garray_T *gap, linenr_T line1, linenr_T line2, linenr_T dest)
--- 3066,3072 ----
#define fold_end(fp) ((fp)->fd_top + (fp)->fd_len - 1)
#define valid_fold(fp, gap) ((gap)->ga_len > 0 && (fp) < ((fold_T *)(gap)->ga_data + (gap)->ga_len))
! #define fold_index(fp, gap) ((size_t)((fp) - ((fold_T *)(gap)->ga_data)))
void
foldMoveRange(garray_T *gap, linenr_T line1, linenr_T line2, linenr_T dest)
*** ../vim-8.2.4401/src/getchar.c 2022-02-16 17:51:43.778583423 +0000
--- src/getchar.c 2022-02-16 19:17:35.850185015 +0000
***************
*** 3594,3600 ****
*/
if (got_int)
{
! #define DUM_LEN MAXMAPLEN * 3 + 3
char_u dum[DUM_LEN + 1];
for (;;)
--- 3594,3600 ----
*/
if (got_int)
{
! #define DUM_LEN (MAXMAPLEN * 3 + 3)
char_u dum[DUM_LEN + 1];
for (;;)
*** ../vim-8.2.4401/src/highlight.c 2022-01-08 18:43:36.877446896 +0000
--- src/highlight.c 2022-02-16 19:17:35.850185015 +0000
***************
*** 29,35 ****
"italic", "reverse", "inverse", "nocombine", "strikethrough", "NONE"};
static int hl_attr_table[] =
{HL_BOLD, HL_STANDOUT, HL_UNDERLINE, HL_UNDERCURL, HL_ITALIC, HL_INVERSE, HL_INVERSE, HL_NOCOMBINE, HL_STRIKETHROUGH, 0};
! #define ATTR_COMBINE(attr_a, attr_b) ((((attr_b) & HL_NOCOMBINE) ? attr_b : (attr_a)) | (attr_b))
/*
* Structure that stores information about a highlight group.
--- 29,35 ----
"italic", "reverse", "inverse", "nocombine", "strikethrough", "NONE"};
static int hl_attr_table[] =
{HL_BOLD, HL_STANDOUT, HL_UNDERLINE, HL_UNDERCURL, HL_ITALIC, HL_INVERSE, HL_INVERSE, HL_NOCOMBINE, HL_STRIKETHROUGH, 0};
! #define ATTR_COMBINE(attr_a, attr_b) ((((attr_b) & HL_NOCOMBINE) ? (attr_b) : (attr_a)) | (attr_b))
/*
* Structure that stores information about a highlight group.
***************
*** 2260,2266 ****
# undef RGB
# endif
# ifndef RGB
! # define RGB(r, g, b) ((r<<16) | (g<<8) | (b))
# endif
# ifdef VIMDLL
--- 2260,2266 ----
# undef RGB
# endif
# ifndef RGB
! # define RGB(r, g, b) (((r)<<16) | ((g)<<8) | (b))
# endif
# ifdef VIMDLL
*** ../vim-8.2.4401/src/memline.c 2022-02-16 16:33:24.801844678 +0000
--- src/memline.c 2022-02-16 19:17:35.850185015 +0000
***************
*** 227,233 ****
#define ML_INSERT 0x12 // insert line
#define ML_FIND 0x13 // just find the line
#define ML_FLUSH 0x02 // flush locked block
! #define ML_SIMPLE(x) (x & 0x10) // DEL, INS or FIND
// argument for ml_upd_block0()
typedef enum {
--- 227,233 ----
#define ML_INSERT 0x12 // insert line
#define ML_FIND 0x13 // just find the line
#define ML_FLUSH 0x02 // flush locked block
! #define ML_SIMPLE(x) ((x) & 0x10) // DEL, INS or FIND
// argument for ml_upd_block0()
typedef enum {
*** ../vim-8.2.4401/src/normal.c 2022-01-31 14:59:33.518943700 +0000
--- src/normal.c 2022-02-16 19:17:35.854185008 +0000
***************
*** 1563,1569 ****
* Routines for displaying a partly typed command
*/
! #define SHOWCMD_BUFLEN SHOWCMD_COLS + 1 + 30
static char_u showcmd_buf[SHOWCMD_BUFLEN];
static char_u old_showcmd_buf[SHOWCMD_BUFLEN]; // For push_showcmd()
static int showcmd_is_clear = TRUE;
--- 1563,1569 ----
* Routines for displaying a partly typed command
*/
! #define SHOWCMD_BUFLEN (SHOWCMD_COLS + 1 + 30)
static char_u showcmd_buf[SHOWCMD_BUFLEN];
static char_u old_showcmd_buf[SHOWCMD_BUFLEN]; // For push_showcmd()
static int showcmd_is_clear = TRUE;
*** ../vim-8.2.4401/src/quickfix.c 2022-02-08 18:08:49.940360054 +0000
--- src/quickfix.c 2022-02-16 19:17:35.854185008 +0000
***************
*** 189,216 ****
static qf_info_T *ll_get_or_alloc_list(win_T *);
// Quickfix window check helper macro
! #define IS_QF_WINDOW(wp) (bt_quickfix(wp->w_buffer) && wp->w_llist_ref == NULL)
// Location list window check helper macro
! #define IS_LL_WINDOW(wp) (bt_quickfix(wp->w_buffer) && wp->w_llist_ref != NULL)
// Quickfix and location list stack check helper macros
! #define IS_QF_STACK(qi) (qi->qfl_type == QFLT_QUICKFIX)
! #define IS_LL_STACK(qi) (qi->qfl_type == QFLT_LOCATION)
! #define IS_QF_LIST(qfl) (qfl->qfl_type == QFLT_QUICKFIX)
! #define IS_LL_LIST(qfl) (qfl->qfl_type == QFLT_LOCATION)
/*
* Return location list for window 'wp'
* For location list window, return the referenced location list
*/
! #define GET_LOC_LIST(wp) (IS_LL_WINDOW(wp) ? wp->w_llist_ref : wp->w_llist)
// Macro to loop through all the items in a quickfix list
// Quickfix item index starts from 1, so i below starts at 1
#define FOR_ALL_QFL_ITEMS(qfl, qfp, i) \
! for (i = 1, qfp = qfl->qf_start; \
! !got_int && i <= qfl->qf_count && qfp != NULL; \
! ++i, qfp = qfp->qf_next)
/*
* Looking up a buffer can be slow if there are many. Remember the last one
--- 189,216 ----
static qf_info_T *ll_get_or_alloc_list(win_T *);
// Quickfix window check helper macro
! #define IS_QF_WINDOW(wp) (bt_quickfix((wp)->w_buffer) && (wp)->w_llist_ref == NULL)
// Location list window check helper macro
! #define IS_LL_WINDOW(wp) (bt_quickfix((wp)->w_buffer) && (wp)->w_llist_ref != NULL)
// Quickfix and location list stack check helper macros
! #define IS_QF_STACK(qi) ((qi)->qfl_type == QFLT_QUICKFIX)
! #define IS_LL_STACK(qi) ((qi)->qfl_type == QFLT_LOCATION)
! #define IS_QF_LIST(qfl) ((qfl)->qfl_type == QFLT_QUICKFIX)
! #define IS_LL_LIST(qfl) ((qfl)->qfl_type == QFLT_LOCATION)
/*
* Return location list for window 'wp'
* For location list window, return the referenced location list
*/
! #define GET_LOC_LIST(wp) (IS_LL_WINDOW(wp) ? (wp)->w_llist_ref : (wp)->w_llist)
// Macro to loop through all the items in a quickfix list
// Quickfix item index starts from 1, so i below starts at 1
#define FOR_ALL_QFL_ITEMS(qfl, qfp, i) \
! for ((i) = 1, (qfp) = (qfl)->qf_start; \
! !got_int && (i) <= (qfl)->qf_count && (qfp) != NULL; \
! ++(i), (qfp) = (qfp)->qf_next)
/*
* Looking up a buffer can be slow if there are many. Remember the last one
*** ../vim-8.2.4401/src/regexp.c 2022-01-31 14:59:33.522943638 +0000
--- src/regexp.c 2022-02-16 19:17:35.854185008 +0000
***************
*** 247,261 ****
done = TRUE;
}
! #define ri_digit(c) (c < 0x100 && (class_tab[c] & RI_DIGIT))
! #define ri_hex(c) (c < 0x100 && (class_tab[c] & RI_HEX))
! #define ri_octal(c) (c < 0x100 && (class_tab[c] & RI_OCTAL))
! #define ri_word(c) (c < 0x100 && (class_tab[c] & RI_WORD))
! #define ri_head(c) (c < 0x100 && (class_tab[c] & RI_HEAD))
! #define ri_alpha(c) (c < 0x100 && (class_tab[c] & RI_ALPHA))
! #define ri_lower(c) (c < 0x100 && (class_tab[c] & RI_LOWER))
! #define ri_upper(c) (c < 0x100 && (class_tab[c] & RI_UPPER))
! #define ri_white(c) (c < 0x100 && (class_tab[c] & RI_WHITE))
// flags for regflags
#define RF_ICASE 1 // ignore case
--- 247,261 ----
done = TRUE;
}
! #define ri_digit(c) ((c) < 0x100 && (class_tab[c] & RI_DIGIT))
! #define ri_hex(c) ((c) < 0x100 && (class_tab[c] & RI_HEX))
! #define ri_octal(c) ((c) < 0x100 && (class_tab[c] & RI_OCTAL))
! #define ri_word(c) ((c) < 0x100 && (class_tab[c] & RI_WORD))
! #define ri_head(c) ((c) < 0x100 && (class_tab[c] & RI_HEAD))
! #define ri_alpha(c) ((c) < 0x100 && (class_tab[c] & RI_ALPHA))
! #define ri_lower(c) ((c) < 0x100 && (class_tab[c] & RI_LOWER))
! #define ri_upper(c) ((c) < 0x100 && (class_tab[c] & RI_UPPER))
! #define ri_white(c) ((c) < 0x100 && (class_tab[c] & RI_WHITE))
// flags for regflags
#define RF_ICASE 1 // ignore case
*** ../vim-8.2.4401/src/search.c 2022-02-14 12:44:05.755468627 +0000
--- src/search.c 2022-02-16 19:17:35.854185008 +0000
***************
*** 4300,4314 ****
// bonus if the first letter is matched
#define FIRST_LETTER_BONUS 15
// penalty applied for every letter in str before the first match
! #define LEADING_LETTER_PENALTY -5
// maximum penalty for leading letters
! #define MAX_LEADING_LETTER_PENALTY -15
// penalty for every letter that doesn't match
! #define UNMATCHED_LETTER_PENALTY -1
// penalty for gap in matching positions (-2 * k)
! #define GAP_PENALTY -2
// Score for a string that doesn't fuzzy match the pattern
! #define SCORE_NONE -9999
#define FUZZY_MATCH_RECURSION_LIMIT 10
--- 4300,4314 ----
// bonus if the first letter is matched
#define FIRST_LETTER_BONUS 15
// penalty applied for every letter in str before the first match
! #define LEADING_LETTER_PENALTY (-5)
// maximum penalty for leading letters
! #define MAX_LEADING_LETTER_PENALTY (-15)
// penalty for every letter that doesn't match
! #define UNMATCHED_LETTER_PENALTY (-1)
// penalty for gap in matching positions (-2 * k)
! #define GAP_PENALTY (-2)
// Score for a string that doesn't fuzzy match the pattern
! #define SCORE_NONE (-9999)
#define FUZZY_MATCH_RECURSION_LIMIT 10
*** ../vim-8.2.4401/src/sha256.c 2019-12-07 17:32:02.000000000 +0000
--- src/sha256.c 2022-02-16 19:17:35.854185008 +0000
***************
*** 79,86 ****
GET_UINT32(W[14], data, 56);
GET_UINT32(W[15], data, 60);
! #define SHR(x, n) ((x & 0xFFFFFFFF) >> n)
! #define ROTR(x, n) (SHR(x, n) | (x << (32 - n)))
#define S0(x) (ROTR(x, 7) ^ ROTR(x, 18) ^ SHR(x, 3))
#define S1(x) (ROTR(x, 17) ^ ROTR(x, 19) ^ SHR(x, 10))
--- 79,86 ----
GET_UINT32(W[14], data, 56);
GET_UINT32(W[15], data, 60);
! #define SHR(x, n) (((x) & 0xFFFFFFFF) >> (n))
! #define ROTR(x, n) (SHR(x, n) | ((x) << (32 - (n))))
#define S0(x) (ROTR(x, 7) ^ ROTR(x, 18) ^ SHR(x, 3))
#define S1(x) (ROTR(x, 17) ^ ROTR(x, 19) ^ SHR(x, 10))
***************
*** 88,107 ****
#define S2(x) (ROTR(x, 2) ^ ROTR(x, 13) ^ ROTR(x, 22))
#define S3(x) (ROTR(x, 6) ^ ROTR(x, 11) ^ ROTR(x, 25))
! #define F0(x, y, z) ((x & y) | (z & (x | y)))
! #define F1(x, y, z) (z ^ (x & (y ^ z)))
#define R(t) \
( \
! W[t] = S1(W[t - 2]) + W[t - 7] + \
! S0(W[t - 15]) + W[t - 16] \
)
#define P(a,b,c,d,e,f,g,h,x,K) \
{ \
! temp1 = h + S3(e) + F1(e, f, g) + K + x; \
temp2 = S2(a) + F0(a, b, c); \
! d += temp1; h = temp1 + temp2; \
}
A = ctx->state[0];
--- 88,107 ----
#define S2(x) (ROTR(x, 2) ^ ROTR(x, 13) ^ ROTR(x, 22))
#define S3(x) (ROTR(x, 6) ^ ROTR(x, 11) ^ ROTR(x, 25))
! #define F0(x, y, z) (((x) & (y)) | ((z) & ((x) | (y))))
! #define F1(x, y, z) ((z) ^ ((x) & ((y) ^ (z))))
#define R(t) \
( \
! W[t] = S1(W[(t) - 2]) + W[(t) - 7] + \
! S0(W[(t) - 15]) + W[(t) - 16] \
)
#define P(a,b,c,d,e,f,g,h,x,K) \
{ \
! temp1 = (h) + S3(e) + F1(e, f, g) + (K) + (x); \
temp2 = S2(a) + F0(a, b, c); \
! (d) += temp1; (h) = temp1 + temp2; \
}
A = ctx->state[0];
*** ../vim-8.2.4401/src/spell.c 2022-01-31 14:59:33.526943578 +0000
--- src/spell.c 2022-02-16 19:17:35.854185008 +0000
***************
*** 67,73 ****
#define REGION_ALL 0xff // word valid in all regions
// Result values. Lower number is accepted over higher one.
! #define SP_BANNED -1
#define SP_OK 0
#define SP_RARE 1
#define SP_LOCAL 2
--- 67,73 ----
#define REGION_ALL 0xff // word valid in all regions
// Result values. Lower number is accepted over higher one.
! #define SP_BANNED (-1)
#define SP_OK 0
#define SP_RARE 1
#define SP_LOCAL 2
*** ../vim-8.2.4401/src/spellfile.c 2022-02-11 15:12:06.053929449 +0000
--- src/spellfile.c 2022-02-16 19:17:35.858185000 +0000
***************
*** 2018,2024 ****
// In the postponed prefixes tree wn_flags is used to store the WFP_ flags,
// but it must be negative to indicate the prefix tree to tree_add_word().
// Use a negative number with the lower 8 bits zero.
! #define PFX_FLAGS -256
// flags for "condit" argument of store_aff_word()
#define CONDIT_COMB 1 // affix must combine
--- 2018,2024 ----
// In the postponed prefixes tree wn_flags is used to store the WFP_ flags,
// but it must be negative to indicate the prefix tree to tree_add_word().
// Use a negative number with the lower 8 bits zero.
! #define PFX_FLAGS (-256)
// flags for "condit" argument of store_aff_word()
#define CONDIT_COMB 1 // affix must combine
*** ../vim-8.2.4401/src/spellsuggest.c 2022-01-30 12:10:14.871460295 +0000
--- src/spellsuggest.c 2022-02-16 19:17:35.858185000 +0000
***************
*** 23,35 ****
* vs "ht") and goes down in the list.
* Used when 'spellsuggest' is set to "best".
*/
! #define RESCORE(word_score, sound_score) ((3 * word_score + sound_score) / 4)
/*
* Do the opposite: based on a maximum end score and a known sound score,
* compute the maximum word score that can be used.
*/
! #define MAXSCORE(word_score, sound_score) ((4 * word_score - sound_score) / 3)
// only used for su_badflags
#define WF_MIXCAP 0x20 // mix of upper and lower case: macaRONI
--- 23,35 ----
* vs "ht") and goes down in the list.
* Used when 'spellsuggest' is set to "best".
*/
! #define RESCORE(word_score, sound_score) ((3 * (word_score) + (sound_score)) / 4)
/*
* Do the opposite: based on a maximum end score and a known sound score,
* compute the maximum word score that can be used.
*/
! #define MAXSCORE(word_score, sound_score) ((4 * (word_score) - (sound_score)) / 3)
// only used for su_badflags
#define WF_MIXCAP 0x20 // mix of upper and lower case: macaRONI
***************
*** 70,76 ****
#define SUG(ga, i) (((suggest_T *)(ga).ga_data)[i])
// TRUE if a word appears in the list of banned words.
! #define WAS_BANNED(su, word) (!HASHITEM_EMPTY(hash_find(&su->su_banned, word)))
// Number of suggestions kept when cleaning up. We need to keep more than
// what is displayed, because when rescore_suggestions() is called the score
--- 70,76 ----
#define SUG(ga, i) (((suggest_T *)(ga).ga_data)[i])
// TRUE if a word appears in the list of banned words.
! #define WAS_BANNED(su, word) (!HASHITEM_EMPTY(hash_find(&(su)->su_banned, word)))
// Number of suggestions kept when cleaning up. We need to keep more than
// what is displayed, because when rescore_suggestions() is called the score
***************
*** 118,124 ****
#define SCORE_SFMAX2 300 // maximum score for second try
#define SCORE_SFMAX3 400 // maximum score for third try
! #define SCORE_BIG SCORE_INS * 3 // big difference
#define SCORE_MAXMAX 999999 // accept any score
#define SCORE_LIMITMAX 350 // for spell_edit_score_limit()
--- 118,124 ----
#define SCORE_SFMAX2 300 // maximum score for second try
#define SCORE_SFMAX3 400 // maximum score for third try
! #define SCORE_BIG (SCORE_INS * 3) // big difference
#define SCORE_MAXMAX 999999 // accept any score
#define SCORE_LIMITMAX 350 // for spell_edit_score_limit()
***************
*** 1214,1220 ****
// Check the maximum score, if we go over it we won't try this change.
#define TRY_DEEPER(su, stack, depth, add) \
! (depth < MAXWLEN - 1 && stack[depth].ts_score + (add) < su->su_maxscore)
/*
* Try finding suggestions by adding/removing/swapping letters.
--- 1214,1220 ----
// Check the maximum score, if we go over it we won't try this change.
#define TRY_DEEPER(su, stack, depth, add) \
! ((depth) < MAXWLEN - 1 && (stack)[depth].ts_score + (add) < (su)->su_maxscore)
/*
* Try finding suggestions by adding/removing/swapping letters.
***************
*** 3077,3083 ****
} sftword_T;
static sftword_T dumsft;
! #define HIKEY2SFT(p) ((sftword_T *)(p - (dumsft.sft_word - (char_u *)&dumsft)))
#define HI2SFT(hi) HIKEY2SFT((hi)->hi_key)
/*
--- 3077,3083 ----
} sftword_T;
static sftword_T dumsft;
! #define HIKEY2SFT(p) ((sftword_T *)((p) - (dumsft.sft_word - (char_u *)&dumsft)))
#define HI2SFT(hi) HIKEY2SFT((hi)->hi_key)
/*
*** ../vim-8.2.4401/src/syntax.c 2022-02-06 11:41:52.986808574 +0000
--- src/syntax.c 2022-02-16 19:17:35.858185000 +0000
***************
*** 81,87 ****
#define SYN_ITEMS(buf) ((synpat_T *)((buf)->b_syn_patterns.ga_data))
! #define NONE_IDX -2 // value of sp_sync_idx for "NONE"
/*
* Flags for b_syn_sync_flags:
--- 81,87 ----
#define SYN_ITEMS(buf) ((synpat_T *)((buf)->b_syn_patterns.ga_data))
! #define NONE_IDX (-2) // value of sp_sync_idx for "NONE"
/*
* Flags for b_syn_sync_flags:
***************
*** 207,214 ****
// pattern
} stateitem_T;
! #define KEYWORD_IDX -1 // value of si_idx for keywords
! #define ID_LIST_ALL (short *)-1 // valid of si_cont_list for containing all
// but contained groups
#ifdef FEAT_CONCEAL
--- 207,214 ----
// pattern
} stateitem_T;
! #define KEYWORD_IDX (-1) // value of si_idx for keywords
! #define ID_LIST_ALL ((short *)-1) // valid of si_cont_list for containing all
// but contained groups
#ifdef FEAT_CONCEAL
*** ../vim-8.2.4401/src/window.c 2022-02-12 11:51:20.048953988 +0000
--- src/window.c 2022-02-16 19:17:35.858185000 +0000
***************
*** 64,70 ****
static win_T *win_alloc(win_T *after, int hidden);
! #define NOWIN (win_T *)-1 // non-existing window
#define ROWS_AVAIL (Rows - p_ch - tabline_height())
--- 64,70 ----
static win_T *win_alloc(win_T *after, int hidden);
! #define NOWIN ((win_T *)-1) // non-existing window
#define ROWS_AVAIL (Rows - p_ch - tabline_height())
*** ../vim-8.2.4401/src/version.c 2022-02-16 18:27:32.583437344 +0000
--- src/version.c 2022-02-16 19:15:03.042439585 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4402,
/**/
--
hundred-and-one symptoms of being an internet addict:
53. To find out what time it is, you send yourself an e-mail and check the
"Date:" field.
/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages