Merge branch 'busybox' into merge

1 files changed, 14 insertions, 5 deletions

diff --git a/editors/vi.c b/editors/vi.c
index d5d7dfffc..2a7d9f0a8 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -345,7 +345,8 @@ struct globals {
 
         /* a few references only */
 #if ENABLE_FEATURE_VI_YANKMARK
-        int YDreg, Ureg;        // default delete register and orig line for "U"
+        smalluint YDreg;//,Ureg;// default delete register and orig line for "U"
+#define Ureg 27
         char *reg[28];          // named register a-z, "D", and "U" 0-25,26,27
         char *mark[28];         // user marks points somewhere in text[]-  a-z and previous context ''
         char *context_start, *context_end;
@@ -457,7 +458,7 @@ struct globals {
 #define format_edit_status__tot (G.format_edit_status__tot)
 
 #define YDreg          (G.YDreg         )
-#define Ureg           (G.Ureg          )
+//#define Ureg           (G.Ureg          )
 #define mark           (G.mark          )
 #define context_start  (G.context_start )
 #define context_end    (G.context_end   )
@@ -796,7 +797,7 @@ static void edit_file(char *fn)
 
 #if ENABLE_FEATURE_VI_YANKMARK
         YDreg = 26;                     // default Yank/Delete reg
-        Ureg = 27;                      // hold orig line for "U" cmd
+//      Ureg = 27; - const              // hold orig line for "U" cmd
         mark[26] = mark[27] = text;     // init "previous context"
 #endif
 
@@ -3410,7 +3411,15 @@ static void refresh(int full_screen)
         if (ENABLE_FEATURE_VI_WIN_RESIZE IF_FEATURE_VI_ASK_TERMINAL(&& !G.get_rowcol_error) ) {
                 unsigned c = columns, r = rows;
                 query_screen_dimensions();
+#if ENABLE_FEATURE_VI_USE_SIGNALS
                 full_screen |= (c - columns) | (r - rows);
+#else
+                if (c != columns || r != rows) {
+                        full_screen = TRUE;
+                        /* update screen memory since SIGWINCH won't have done it */
+                        new_screen(rows, columns);
+                }
+#endif
         }
         sync_cursor(dot, &crow, &ccol); // where cursor will be (on "dot")
         tp = screenbegin;       // index into text[] of top line
@@ -4236,8 +4245,8 @@ static void do_cmd(int c)
                                 if (*p == '\n')
                                         cnt++;
                         }
-                        status_line("%s %d lines (%d chars) using [%c]",
-                                buf, cnt, strlen(reg[YDreg]), what_reg());
+                        status_line("%s %u lines (%u chars) using [%c]",
+                                buf, cnt, (unsigned)strlen(reg[YDreg]), what_reg());
 #endif
                         end_cmd_q();    // stop adding to q
                 }