Merge branch 'busybox' into merge

1 files changed, 3 insertions, 3 deletions

diff --git a/editors/vi.c b/editors/vi.c
index 70c8f3daf..4676db2b2 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -1067,7 +1067,7 @@ static int readit(void) // read (maybe cursor) key from stdin
                         goto again;
                 go_bottom_and_clear_to_eol();
                 cookmode(); // terminal to "cooked"
-                bb_error_msg_and_die("can't read user input");
+                bb_simple_error_msg_and_die("can't read user input");
         }
         return c;
 }
@@ -1360,7 +1360,7 @@ static char what_reg(void)
         char c;
 
         c = 'D';                        // default to D-reg
-        if (0 <= YDreg && YDreg <= 25)
+        if (YDreg <= 25)
                 c = 'a' + (char) YDreg;
         if (YDreg == 26)
                 c = 'D';
@@ -2616,7 +2616,7 @@ static void colon(char *buf)
                         free(reg[Ureg]);        //   free orig line reg- for 'U'
                         reg[Ureg] = NULL;
                 }
-                if (YDreg >= 0 && YDreg < 28) {
+                /*if (YDreg < 28) - always true*/ {
                         free(reg[YDreg]);       //   free default yank/delete register
                         reg[YDreg] = NULL;
                 }