From 34c196fec665e47af2bfad6b036c49988fc986b2 Mon Sep 17 00:00:00 2001 From: n-t-roff Date: Tue, 5 Jul 2016 23:02:50 +0200 Subject: [PATCH] Release 4.1.1 --- ex.h | 2 +- ex_cmdsub.c | 3 ++- ex_put.c | 4 +++- ex_version.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ex.h b/ex.h index a494633..395c59d 100644 --- a/ex.h +++ b/ex.h @@ -450,7 +450,7 @@ var int exitoneof; /* exit command loop on EOF */ #define FIXUNDO (inopen >= 0 && (inopen || !inglobal)) #define ckaw() {if (chng && value(AUTOWRITE)) wop(0);} #define copy(a,b,c) Copy((char *) (a), (char *) (b), (c)) -#define eq(a, b) ((a) != NULL && (b) != NULL && strcmp(a, b) == 0) +#define eq(a, b) ((void *)(a) != NULL && (void *)(b) != NULL && strcmp(a, b) == 0) #define getexit(a) copy(a, resetlab, sizeof (JMP_BUF)) #define lastchar() lastc #define outchar(c) (*Outchar)(c) diff --git a/ex_cmdsub.c b/ex_cmdsub.c index a7387a0..d2ca1ff 100644 --- a/ex_cmdsub.c +++ b/ex_cmdsub.c @@ -602,7 +602,8 @@ tagfind(bool quick) * Loop once for each file in tags "path". */ safecp(tagfbuf, svalue(TAGS), sizeof tagfbuf, "Tag too long"); - fne = tagfbuf - 1; + fne = tagfbuf; + fne--; #ifdef FASTTAG ft_iofbuf = smalloc(MAXBSIZE); #endif diff --git a/ex_put.c b/ex_put.c index 7670898..26236d4 100644 --- a/ex_put.c +++ b/ex_put.c @@ -1188,14 +1188,16 @@ ttcharoff(void) #ifdef VSTATUS tty.c_cc[VSTATUS] = vdis; #endif -# ifdef VSTART /* * The following is sample code if USG ever lets people change * their start/stop chars. As long as they can't we can't get * into trouble so we just leave them alone. */ +# ifdef VSTART if (tty.c_cc[VSTART] != CTRL('q')) tty.c_cc[VSTART] = vdis; +# endif +# ifdef VSTOP if (tty.c_cc[VSTOP] != CTRL('s')) tty.c_cc[VSTOP] = vdis; # endif diff --git a/ex_version.c b/ex_version.c index e9b3320..2c78b58 100644 --- a/ex_version.c +++ b/ex_version.c @@ -75,7 +75,7 @@ #include "ex.h" -static char *versionstring = "@(#)Version 4.1.0 (gritter) 6/24/16"; +static char *versionstring = "@(#)Version 4.1.1 (gritter) 7/5/16"; void printver(void)