To: vim_dev@googlegroups.com Subject: Patch 8.2.0762 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0762 Problem: Buffer is not considered modified after setting crypt key. Solution: Set the modified flag. (Christian Brabandt, closes #6082) Files: src/optionstr.c, src/testdir/test_crypt.vim *** ../vim-8.2.0761/src/optionstr.c 2020-04-17 19:41:16.100078313 +0200 --- src/optionstr.c 2020-05-15 22:28:34.399878939 +0200 *************** *** 1157,1164 **** --- 1157,1167 ---- if (STRCMP(curbuf->b_p_key, oldval) != 0) // Need to update the swapfile. + { ml_set_crypt_key(curbuf, oldval, *curbuf->b_p_cm == NUL ? p_cm : curbuf->b_p_cm); + changed_internal(); + } } else if (gvarp == &p_cm) *** ../vim-8.2.0761/src/testdir/test_crypt.vim 2019-06-15 17:30:57.000000000 +0200 --- src/testdir/test_crypt.vim 2020-05-15 22:30:07.107578455 +0200 *************** *** 110,112 **** --- 110,138 ---- bwipe! endfunc + func Test_crypt_set_key_changes_buffer() + + new Xtest1.txt + call setline(1, 'nothing') + set cryptmethod=blowfish2 + call feedkeys(":X\foobar\foobar\", 'xt') + call assert_fails(":q", "E37:") + w + set key=anotherkey + call assert_fails(":bw") + w + call feedkeys(":X\foobar\foobar\", 'xt') + call assert_fails(":bw") + w + let winnr = winnr() + wincmd p + call setwinvar(winnr, '&key', 'yetanotherkey') + wincmd p + call assert_fails(":bw") + w + + set cryptmethod& + set key= + bwipe! + call delete('Xtest1.txt') + endfunc *** ../vim-8.2.0761/src/version.c 2020-05-15 22:01:51.284965534 +0200 --- src/version.c 2020-05-15 22:29:40.911663367 +0200 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 762, /**/ -- hundred-and-one symptoms of being an internet addict: 99. The hum of a cooling fan and the click of keys is comforting to you. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///