diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-02-23 01:02:44 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-02-23 19:48:41 +0300 |
| commit | f387de4ec01a586215d9a29193003c18d993886d (patch) | |
| tree | bc265ba061c99eb9812c0363c466ae64c030c5d9 /src | |
| parent | d8a7e5fdbb7d94f06e30aedaea42028caec52c95 (diff) | |
| download | rneovim-f387de4ec01a586215d9a29193003c18d993886d.tar.gz rneovim-f387de4ec01a586215d9a29193003c18d993886d.tar.bz2 rneovim-f387de4ec01a586215d9a29193003c18d993886d.zip | |
eval: Remove incorrect workaround
Was replaced by the previous patch. Also fixes legacy test 055.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 25ac0e2ad1..9b1c0fde1a 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -3098,11 +3098,7 @@ static int do_lock_var(lval_T *lp, char_u *name_end, int deep, int lock) // Dictionaries. E.g. b: dictionary may be locked/unlocked. emsgf(_("E940: Cannot lock or unlock variable %s"), lp->ll_name); } else { - if ((di->di_flags & (DI_FLAGS_LOCK|DI_FLAGS_FIX)) - == (DI_FLAGS_LOCK|DI_FLAGS_FIX)) { - // Locked and fixed: do not alter lock, but issue an error. - emsgf(_(e_readonlyvar), (int)name_len, lp->ll_name); - } else if (lock) { + if (lock) { di->di_flags |= DI_FLAGS_LOCK; } else { di->di_flags &= ~DI_FLAGS_LOCK; |