emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vi: further fixes to undo after autoindent

Browse Source 
Commit bb983f30e (vi: fix faulty undo after autoinsert) has a
number of problems:

- The commit message refers to 'autoinsert' when it really means
  'autoindent'.

- The indentation of undo_push_insert() was incorrect.

- Most seriously the commit only fixed the problem for cases where
  the indentation was exactly one character.  This is because undo_push()
  only allows single characters to be queued for UNDO_INS_QUEUED.

  Lifting this restriction allows the example given in the previous
  commit message (with a three character indent) to work.

function                                             old     new   delta
undo_push                                            406     435     +29
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/0 up/down: 29/0)               Total: 29 bytes

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ron Yorston 2019-02-11 08:29:15 +00:00 committed by Denys Vlasenko
parent dac8f5ea38
commit 61052d1bb8
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
editors/vi.c
View File

@ -2314,16 +2314,18 @@ static void undo_push(char *src, unsigned int length, uint8_t u_type) // Add to
} }
break; break;
case UNDO_INS_QUEUED: case UNDO_INS_QUEUED:
if (length != 1) if (length < 1)
return; return;
switch (undo_queue_state) { switch (undo_queue_state) {
case UNDO_EMPTY: case UNDO_EMPTY:
undo_queue_state = UNDO_INS; undo_queue_state = UNDO_INS;
undo_queue_spos = src; undo_queue_spos = src;
case UNDO_INS: case UNDO_INS:
undo_q++; // Don't need to save any data for insertions while (length--) {
if (undo_q == CONFIG_FEATURE_VI_UNDO_QUEUE_MAX) undo_q++; // Don't need to save any data for insertions
undo_queue_commit(); if (undo_q == CONFIG_FEATURE_VI_UNDO_QUEUE_MAX)
undo_queue_commit();
}
return; return;
case UNDO_DEL: case UNDO_DEL:
// Switch from storing deleted text to inserted text // Switch from storing deleted text to inserted text
@ -2372,16 +2374,16 @@ static void undo_push(char *src, unsigned int length, uint8_t u_type) // Add to
static void undo_push_insert(char *p, int len, int undo) static void undo_push_insert(char *p, int len, int undo)
{ {
switch (undo) { switch (undo) {
case ALLOW_UNDO: case ALLOW_UNDO:
undo_push(p, len, UNDO_INS); undo_push(p, len, UNDO_INS);
break; break;
case ALLOW_UNDO_CHAIN: case ALLOW_UNDO_CHAIN:
undo_push(p, len, UNDO_INS_CHAIN); undo_push(p, len, UNDO_INS_CHAIN);
break; break;
# if ENABLE_FEATURE_VI_UNDO_QUEUE # if ENABLE_FEATURE_VI_UNDO_QUEUE
case ALLOW_UNDO_QUEUED: case ALLOW_UNDO_QUEUED:
undo_push(p, len, UNDO_INS_QUEUED); undo_push(p, len, UNDO_INS_QUEUED);
break; break;
# endif # endif
} }
} }