Merge branch 'busybox' into merge

1 files changed, 77 insertions, 34 deletions

diff --git a/editors/vi.c b/editors/vi.c
index 3dcde9b24..a4d6b21b4 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -307,7 +307,6 @@ struct globals {
 #define err_method (vi_setops & VI_ERR_METHOD) // indicate error with beep or flash
 #define ignorecase (vi_setops & VI_IGNORECASE)
 #define showmatch  (vi_setops & VI_SHOWMATCH )
-#define openabove  (vi_setops & VI_TABSTOP   )
 // order of constants and strings must match
 #define OPTS_STR \
                 "ai\0""autoindent\0" \
@@ -316,15 +315,10 @@ struct globals {
                 "ic\0""ignorecase\0" \
                 "sm\0""showmatch\0" \
                 "ts\0""tabstop\0"
-#define set_openabove() (vi_setops |= VI_TABSTOP)
-#define clear_openabove() (vi_setops &= ~VI_TABSTOP)
 #else
 #define autoindent (0)
 #define expandtab  (0)
 #define err_method (0)
-#define openabove  (0)
-#define set_openabove() ((void)0)
-#define clear_openabove() ((void)0)
 #endif
 
 #if ENABLE_FEATURE_VI_READONLY
@@ -380,6 +374,9 @@ struct globals {
 #if ENABLE_FEATURE_VI_SEARCH
         char *last_search_pattern; // last pattern from a '/' or '?' search
 #endif
+#if ENABLE_FEATURE_VI_SETOPTS
+        int indentcol;          // column of recently autoindent, 0 or -1
+#endif
 
         // former statics
 #if ENABLE_FEATURE_VI_YANKMARK
@@ -505,6 +502,7 @@ struct globals {
 #define ioq_start               (G.ioq_start          )
 #define dotcnt                  (G.dotcnt             )
 #define last_search_pattern     (G.last_search_pattern)
+#define indentcol               (G.indentcol          )
 
 #define edit_file__cur_line     (G.edit_file__cur_line)
 #define refresh__old_offset     (G.refresh__old_offset)
@@ -2155,15 +2153,26 @@ static uintptr_t stupid_insert(char *p, char c) // stupidly insert the char c at
         return bias;
 }
 
+// find number of characters in indent, p must be at beginning of line
+static size_t indent_len(char *p)
+{
+        char *r = p;
+
+        while (r < (end - 1) && isblank(*r))
+                r++;
+        return r - p;
+}
+
 #if !ENABLE_FEATURE_VI_UNDO
 #define char_insert(a,b,c) char_insert(a,b)
 #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;
+        int col, ntab, nspc;
 #endif
+        char *bol = begin_line(p);
 
         if (c == 22) {          // Is this an ctrl-V?
                 p += stupid_insert(p, '^');     // use ^ to indicate literal next
@@ -2185,25 +2194,36 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
                 if ((p[-1] != '\n') && (dot > text)) {
                         p--;
                 }
-        } else if (c == 4) {    // ctrl-D reduces indentation
-                int prev;
-                char *r, *bol;
-                bol = begin_line(p);
-                for (r = bol; r < end_line(p); ++r) {
-                        if (!isblank(*r))
-                                break;
+#if ENABLE_FEATURE_VI_SETOPTS
+                if (autoindent) {
+                        len = indent_len(bol);
+                        if (len && get_column(bol + len) == indentcol) {
+                                // remove autoindent from otherwise empty line
+                                text_hole_delete(bol, bol + len - 1, undo);
+                                p = bol;
+                        }
                 }
-
-                prev = prev_tabstop(get_column(r));
+#endif
+        } else if (c == 4) {    // ctrl-D reduces indentation
+                char *r = bol + indent_len(bol);
+                int prev = prev_tabstop(get_column(r));
                 while (r > bol && get_column(r) > prev) {
                         if (p > bol)
                                 p--;
                         r--;
                         r = text_hole_delete(r, r, ALLOW_UNDO_QUEUED);
                 }
+
+#if ENABLE_FEATURE_VI_SETOPTS
+                if (autoindent && indentcol && r == end_line(p)) {
+                        // record changed size of autoindent
+                        indentcol = get_column(p);
+                        return p;
+                }
+#endif
 #if ENABLE_FEATURE_VI_SETOPTS
         } else if (c == '\t' && expandtab) {    // expand tab
-                int col = get_column(p);
+                col = get_column(p);
                 col = next_tabstop(col) - col + 1;
                 while (col--) {
 # if ENABLE_FEATURE_VI_UNDO
@@ -2242,27 +2262,46 @@ 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
-                        // use current/previous line as template
-                        q = openabove ? p : prev_line(p);
-                        len = strspn(q, " \t"); // space or tab
-                        if (openabove) {
-                                p--;            // this replaces dot_prev() in do_cmd()
-                                q += len;       // template will be shifted by text_hole_make()
+                        // use indent of current/previous line
+                        bol = indentcol < 0 ? p : prev_line(p);
+                        len = indent_len(bol);
+                        col = get_column(bol + len);
+
+                        if (len && col == indentcol) {
+                                // previous line was empty except for autoindent
+                                // move the indent to the current line
+                                memmove(bol + 1, bol, len);
+                                *bol = '\n';
+                                return p;
                         }
+
+                        if (indentcol < 0)
+                                p--;    // open above, indent before newly inserted NL
+
                         if (len) {
-                                uintptr_t bias;
-                                bias = text_hole_make(p, len);
-                                p += bias;
-                                q += bias;
+                                indentcol = col;
+                                if (expandtab) {
+                                        ntab = 0;
+                                        nspc = col;
+                                } else {
+                                        ntab = col / tabstop;
+                                        nspc = col % tabstop;
+                                }
+                                p += text_hole_make(p, ntab + nspc);
 # if ENABLE_FEATURE_VI_UNDO
-                                undo_push_insert(p, len, undo);
+                                undo_push_insert(p, ntab + nspc, undo);
 # endif
-                                memcpy(p, q, len);
-                                p += len;
+                                memset(p, '\t', ntab);
+                                p += ntab;
+                                memset(p, ' ', nspc);
+                                return p + nspc;
                         }
                 }
 #endif
         }
+#if ENABLE_FEATURE_VI_SETOPTS
+        indentcol = 0;
+#endif
         return p;
 }
 
@@ -2647,7 +2686,6 @@ static void setops(char *args, int flg_no)
         index = 1 << (index >> 1); // convert to VI_bit
 
         if (index & VI_TABSTOP) {
-                // don't set this bit in vi_setops, it's reused as 'openabove'
                 int t;
                 if (!eq || flg_no) // no "=NNN" or it is "notabstop"?
                         goto bad;
@@ -3783,6 +3821,7 @@ static void do_cmd(int c)
 # endif
                 } while (--cmdcnt > 0);
                 dot += cnt;
+                dot_skip_over_ws();
 # if ENABLE_FEATURE_VI_YANKMARK && ENABLE_FEATURE_VI_VERBOSE_STATUS
                 yank_status("Put", p, i);
 # endif
@@ -4109,17 +4148,18 @@ static void do_cmd(int c)
                 break;
         case 'O':                       // O- open an empty line above
                 dot_begin();
-                set_openabove();
+#if ENABLE_FEATURE_VI_SETOPTS
+                indentcol = -1;
+#endif
                 goto dc3;
         case 'o':                       // o- open an empty line below
                 dot_end();
  dc3:
                 dot = char_insert(dot, '\n', ALLOW_UNDO);
                 if (c == 'O' && !autoindent) {
-                        // done in char_insert() for openabove+autoindent
+                        // done in char_insert() for 'O'+autoindent
                         dot_prev();
                 }
-                clear_openabove();
                 goto dc_i;
                 break;
         case 'R':                       // R- continuous Replace char
@@ -4238,6 +4278,9 @@ static void do_cmd(int c)
                                 if (dot != (end-1)) {
                                         dot_prev();
                                 }
+                        } else if (c == 'd') {
+                                dot_begin();
+                                dot_skip_over_ws();
                         } else {
                                 dot = save_dot;
                         }