xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only commit undo groups when buffer was modified

Browse Source 
This fixes an interaction with kak-lsp that would trigger undo group
commit when setting a buffer option value.
This commit is contained in:
Maxime Coste 2018-09-12 20:02:57 +10:00
parent beb5d00992
commit d3be78cca2
6 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/context.cc
View File

@ -211,7 +211,11 @@ Vector<String> Context::selections_content() const
void Context::begin_edition()
{
if (m_edition_level >= 0)
{
if (m_edition_level == 0)
m_edition_timestamp = buffer().timestamp();
++m_edition_level;
}
}
void Context::end_edition()
@ -220,7 +224,8 @@ void Context::end_edition()
return;
kak_assert(m_edition_level != 0);
if (m_edition_level == 1)
if (m_edition_level == 1 and
buffer().timestamp() != m_edition_timestamp)
buffer().commit_undo_group();
--m_edition_level;

1
src/context.hh
View File

@ -134,6 +134,7 @@ private:
void begin_edition();
void end_edition();
int m_edition_level = 0;
size_t m_edition_timestamp = 0;
friend struct ScopedEdition;

1
test/regression/0-spurious-undo-group-on-external/cmd Normal file
View File

@ -0,0 +1 @@
Abarbaz<esc>u

1
test/regression/0-spurious-undo-group-on-external/in Normal file
View File

@ -0,0 +1 @@
foo

1
test/regression/0-spurious-undo-group-on-external/out Normal file
View File

@ -0,0 +1 @@
foo

2
test/regression/0-spurious-undo-group-on-external/rc Normal file
View File

@ -0,0 +1,2 @@
decl int my_option
hook global InsertChar r %{ eval -buffer %val{buffile} %{ eval "set buffer my_option 1" } }