summaryrefslogtreecommitdiff
path: root/ex_vops2.c
diff options
context:
space:
mode:
Diffstat (limited to 'ex_vops2.c')
-rw-r--r--ex_vops2.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/ex_vops2.c b/ex_vops2.c
index 48050ff..7b1bacc 100644
--- a/ex_vops2.c
+++ b/ex_vops2.c
@@ -178,7 +178,7 @@ showmode(int mode)
char *ocurs, *str;
if (value(SHOWMODE) == 0 || TCOLUMNS <= 20 || state == ONEOPEN
- || state == HARDOPEN || vmacp != NULL)
+ || state == HARDOPEN /*|| vmacp != NULL*/)
return;
ocurs = cursor;
fixech();
@@ -211,7 +211,7 @@ showmode(int mode)
if (value(TERSE))
putchar(str[0]);
else
- printf(&str[1]);
+ ex_printf(&str[1]);
vgoto(sdl, sdc);
cursor = ocurs;
splitw = 0;
@@ -426,7 +426,7 @@ vappend(int ch, int cnt, int indent)
Outchar = vinschar;
hold |= HOLDQIK;
- printf("%s", genbuf);
+ ex_printf("%s", genbuf);
hold = oldhold;
Outchar = vputchar;
}
@@ -806,7 +806,7 @@ vbackup:
}
if (value(WRAPMARGIN) &&
(outcol >= OCOLUMNS - value(WRAPMARGIN) ||
- backsl && outcol==0) &&
+ (backsl && outcol == 0)) &&
commch != 'r') {
/*
* At end of word and hit wrapmargin.
@@ -961,7 +961,7 @@ btrp:
* generated autoindent. We count the ^D for repeat
* purposes.
*/
- if (c == iwhite && c != 0)
+ if (c == iwhite && c != 0) {
if (cp == gcursor) {
iwhite = backtab(c);
CDCNT++;
@@ -985,6 +985,7 @@ btrp:
vputchar(' ');
goto vbackup;
}
+ }
if (vglobp && vglobp - iglobp >= 2 &&
(vglobp[-2] == '^' || vglobp[-2] == '0')
&& gcursor == ogcursor + 1)