summaryrefslogtreecommitdiff
path: root/editors/vi.c
diff options
context:
space:
mode:
authorRon Yorston2021-04-15 12:03:58 +0100
committerDenys Vlasenko2021-04-15 13:09:12 +0200
commitac6495f6fbb97cb59ccd0a6744660346fd9b80b3 (patch)
treeeb4bf13d5b3f9fda9e1fe0c8c658d2d9d5a8eeaa /editors/vi.c
parentd6e653d667bc1eb343014508a8bddb3dd4945f78 (diff)
downloadbusybox-ac6495f6fbb97cb59ccd0a6744660346fd9b80b3.zip
busybox-ac6495f6fbb97cb59ccd0a6744660346fd9b80b3.tar.gz
vi: allow ctrl-D to reduce indentation
When whitespace has been automatically added to a new line due to autoindent entering ctrl-D should reduce the level of indentation. Implement an approximation of this by treating ctrl-D as backspace. For the common case of indentation using tabs this is good enough. My attempt at a full implementation was three times bigger. function old new delta char_insert 476 531 +55 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/0 up/down: 55/0) Total: 55 bytes Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'editors/vi.c')
-rw-r--r--editors/vi.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/editors/vi.c b/editors/vi.c
index 780c812..0a82f9e 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -2072,6 +2072,11 @@ static uintptr_t stupid_insert(char *p, char c) // stupidly insert the char c at
#endif
static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
{
+#if ENABLE_FEATURE_VI_SETOPTS
+ char *q;
+ size_t len;
+#endif
+
if (c == 22) { // Is this an ctrl-V?
p += stupid_insert(p, '^'); // use ^ to indicate literal next
refresh(FALSE); // show the ^
@@ -2092,6 +2097,15 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
if ((p[-1] != '\n') && (dot > text)) {
p--;
}
+#if ENABLE_FEATURE_VI_SETOPTS
+ } else if (c == 4 && autoindent) { // ctrl-D reduces indentation
+ q = begin_line(p);
+ len = strspn(q, " \t");
+ if (len && q + len == p) {
+ p--;
+ p = text_hole_delete(p, p, ALLOW_UNDO_QUEUED);
+ }
+#endif
} else if (c == term_orig.c_cc[VERASE] || c == 8 || c == 127) { // Is this a BS
if (p > text) {
p--;
@@ -2116,8 +2130,6 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
showmatching(p - 1);
}
if (autoindent && c == '\n') { // auto indent the new line
- char *q;
- size_t len;
q = prev_line(p); // use prev line as template
len = strspn(q, " \t"); // space or tab
if (len) {