Update to CVS snapshot, for testing

[alioth/jupp.git] / uedit.c

diff --git a/uedit.c b/uedit.c
index 4b9542b..e550185 100644 (file)
--- a/uedit.c
+++ b/uedit.c
@@ -1,4 +1,4 @@
-/* $MirOS: contrib/code/jupp/uedit.c,v 1.15 2017/01/11 22:56:49 tg Exp $ */
+/* $MirOS: contrib/code/jupp/uedit.c,v 1.17 2017/03/19 19:19:51 tg Exp $ */
 /*
  *     Basic user edit functions
  *     Copyright
@@ -10,6 +10,7 @@
 #include "types.h"
 
 #include <stdio.h>
+#include <string.h>
 
 #ifdef HAVE_BSD_STRING_H
 #include <bsd/string.h>
@@ -670,7 +671,7 @@ static int doline(BW *bw, unsigned char *s, void *object, int *notify)
        if (notify)
                *notify = 1;
        vsrm(s);
-       if (num >= 1 && !merr) {
+       if (num >= 1 && !merrf) {
                int tmp = mid;
 
                if (num > bw->b->eof->line)
@@ -681,8 +682,8 @@ static int doline(BW *bw, unsigned char *s, void *object, int *notify)
                mid = tmp;
                return 0;
        } else {
-               if (merr)
-                       msgnw(bw->parent, merr);
+               if (merrf)
+                       msgnw(bw->parent, merrt);
                else
                        msgnw(bw->parent, US "Invalid line number");
                return -1;
@@ -708,7 +709,7 @@ static int docol(BW *bw, unsigned char *s, void *object, int *notify)
        if (notify)
                *notify = 1;
        vsrm(s);
-       if (num >= 1 && !merr) {
+       if (num >= 1 && !merrf) {
                int tmp = mid;
 
                pcol(bw->cursor, num - 1), bw->cursor->xcol = piscol(bw->cursor);
@@ -717,8 +718,8 @@ static int docol(BW *bw, unsigned char *s, void *object, int *notify)
                mid = tmp;
                return 0;
        } else {
-               if (merr)
-                       msgnw(bw->parent, merr);
+               if (merrf)
+                       msgnw(bw->parent, merrt);
                else
                        msgnw(bw->parent, US "Invalid column number");
                return -1;
@@ -744,7 +745,7 @@ static int dobyte(BW *bw, unsigned char *s, void *object, int *notify)
        if (notify)
                *notify = 1;
        vsrm(s);
-       if (num >= 0 && !merr) {
+       if (num >= 0 && !merrf) {
                int tmp = mid;
 
                pgoto(bw->cursor, num), bw->cursor->xcol = piscol(bw->cursor);
@@ -753,8 +754,8 @@ static int dobyte(BW *bw, unsigned char *s, void *object, int *notify)
                mid = tmp;
                return 0;
        } else {
-               if (merr)
-                       msgnw(bw->parent, merr);
+               if (merrf)
+                       msgnw(bw->parent, merrt);
                else
                        msgnw(bw->parent, US "Invalid byte number");
                return -1;