aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/nvim/option.c9
-rw-r--r--src/nvim/option_defs.h9
-rw-r--r--src/nvim/option_vars.h3
-rw-r--r--src/nvim/optionstr.c9
-rw-r--r--test/old/testdir/test_history.vim5
-rw-r--r--test/old/testdir/test_options.vim16
6 files changed, 33 insertions, 18 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index be089400e5..f771760822 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -136,13 +136,6 @@ static char *p_vsts_nopaste;
#define OPTION_COUNT ARRAY_SIZE(options)
-typedef enum {
- OP_NONE = 0,
- OP_ADDING, ///< "opt+=arg"
- OP_PREPENDING, ///< "opt^=arg"
- OP_REMOVING, ///< "opt-=arg"
-} set_op_T;
-
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "option.c.generated.h"
#endif
@@ -1168,7 +1161,7 @@ static void do_set_option_string(int opt_idx, int opt_flags, char **argp, int ne
// be triggered that can cause havoc.
*errmsg = did_set_string_option(curbuf, curwin, opt_idx, (char **)varp, oldval,
errbuf, errbuflen,
- opt_flags, value_checked);
+ opt_flags, op, value_checked);
secure = secure_saved;
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h
index 7820cbaf4a..dd637aacf5 100644
--- a/src/nvim/option_defs.h
+++ b/src/nvim/option_defs.h
@@ -26,6 +26,14 @@ typedef struct {
} data;
} OptVal;
+/// :set operator types
+typedef enum {
+ OP_NONE = 0,
+ OP_ADDING, ///< "opt+=arg"
+ OP_PREPENDING, ///< "opt^=arg"
+ OP_REMOVING, ///< "opt-=arg"
+} set_op_T;
+
/// Argument for the callback function (opt_did_set_cb_T) invoked after an
/// option value is modified.
typedef struct {
@@ -34,6 +42,7 @@ typedef struct {
void *os_varp;
int os_idx;
int os_flags;
+ set_op_T os_op;
/// old value of the option (can be a string, number or a boolean)
union {
diff --git a/src/nvim/option_vars.h b/src/nvim/option_vars.h
index 13caba221f..86e7f4cee8 100644
--- a/src/nvim/option_vars.h
+++ b/src/nvim/option_vars.h
@@ -53,6 +53,9 @@
#define P_MLE 0x20000000U ///< under control of 'modelineexpr'
#define P_FUNC 0x40000000U ///< accept a function reference or a lambda
#define P_COLON 0x80000000U ///< values use colons to create sublists
+// Warning: Currently we have used all 32 bits for option flags, and adding more
+// flags will overflow it. Adding another flag will need to change how
+// it's stored first.
#define HIGHLIGHT_INIT \
"8:SpecialKey,~:EndOfBuffer,z:TermCursor,Z:TermCursorNC,@:NonText,d:Directory,e:ErrorMsg," \
diff --git a/src/nvim/optionstr.c b/src/nvim/optionstr.c
index f6e7b429eb..a67b3a77bc 100644
--- a/src/nvim/optionstr.c
+++ b/src/nvim/optionstr.c
@@ -503,8 +503,9 @@ const char *set_string_option(const int opt_idx, void *varp_arg, const char *val
secure = 1;
}
- const char *const errmsg = did_set_string_option(curbuf, curwin, opt_idx, varp, oldval, errbuf,
- errbuflen, opt_flags, value_checked);
+ const char *const errmsg = did_set_string_option(curbuf, curwin, opt_idx, varp, oldval,
+ errbuf, errbuflen,
+ opt_flags, OP_NONE, value_checked);
secure = secure_saved;
@@ -2682,11 +2683,12 @@ static void do_spelllang_source(win_T *win)
/// @param errbuf buffer for errors, or NULL
/// @param errbuflen length of errors buffer
/// @param opt_flags OPT_LOCAL and/or OPT_GLOBAL
+/// @param op OP_ADDING/OP_PREPENDING/OP_REMOVING
/// @param value_checked value was checked to be safe, no need to set P_INSECURE
///
/// @return NULL for success, or an untranslated error message for an error
const char *did_set_string_option(buf_T *buf, win_T *win, int opt_idx, char **varp, char *oldval,
- char *errbuf, size_t errbuflen, int opt_flags,
+ char *errbuf, size_t errbuflen, int opt_flags, set_op_T op,
bool *value_checked)
{
const char *errmsg = NULL;
@@ -2700,6 +2702,7 @@ const char *did_set_string_option(buf_T *buf, win_T *win, int opt_idx, char **va
.os_varp = varp,
.os_idx = opt_idx,
.os_flags = opt_flags,
+ .os_op = op,
.os_oldval.string = oldval,
.os_newval.string = *varp,
.os_value_checked = false,
diff --git a/test/old/testdir/test_history.vim b/test/old/testdir/test_history.vim
index f1c31dee04..bb6d671725 100644
--- a/test/old/testdir/test_history.vim
+++ b/test/old/testdir/test_history.vim
@@ -244,8 +244,13 @@ endfunc
" Test for making sure the key value is not stored in history
func Test_history_crypt_key()
CheckFeature cryptv
+
call feedkeys(":set bs=2 key=abc ts=8\<CR>", 'xt')
call assert_equal('set bs=2 key= ts=8', histget(':'))
+
+ call assert_fails("call feedkeys(':set bs=2 key-=abc ts=8\<CR>', 'xt')")
+ call assert_equal('set bs=2 key-= ts=8', histget(':'))
+
set key& bs& ts&
endfunc
diff --git a/test/old/testdir/test_options.vim b/test/old/testdir/test_options.vim
index 9068546c3e..d524ea85a8 100644
--- a/test/old/testdir/test_options.vim
+++ b/test/old/testdir/test_options.vim
@@ -369,13 +369,15 @@ func Test_set_completion()
call feedkeys(":set spellsuggest=best,file:test_options.v\<Tab>\<C-B>\"\<CR>", 'xt')
call assert_equal("\"set spellsuggest=best,file:test_options.vim", @:)
- " Expand value for 'key'
- " set key=abcd
- " call feedkeys(":set key=\<Tab>\<C-B>\"\<CR>", 'xt')
- " call assert_equal('"set key=*****', @:)
- " call feedkeys(":set key-=\<Tab>\<C-B>\"\<CR>", 'xt')
- " call assert_equal('"set key-=*****', @:)
- " set key=
+ " Expanding value for 'key' is disallowed
+ if exists('+key')
+ set key=abcd
+ call feedkeys(":set key=\<Tab>\<C-B>\"\<CR>", 'xt')
+ call assert_equal('"set key=', @:)
+ call feedkeys(":set key-=\<Tab>\<C-B>\"\<CR>", 'xt')
+ call assert_equal('"set key-=', @:)
+ set key=
+ endif
" Expand values for 'filetype'
call feedkeys(":set filetype=sshdconfi\<Tab>\<C-B>\"\<CR>", 'xt')
generated by cgit (git 2.34.1) at 2025-06-24 13:53:23 +0000