vi: create istempbuf()

ex.c

@@ -73,7 +73,7 @@ void bufs_switch(int idx)
 {
 	if (ex_buf != &bufs[idx]) {
 		exbuf_save(ex_buf)
-		if (ex_buf - bufs >= xbufcur || ex_buf - bufs < 0)
+		if (istempbuf(ex_buf))
 			ex_pbuf = &bufs[idx] == ex_pbuf ? ex_tpbuf : ex_pbuf;
 		else
 			ex_pbuf = ex_buf;
@@ -129,7 +129,7 @@ void temp_switch(int i)
 		ex_buf = ex_pbuf;
 		ex_pbuf = ex_tpbuf;
 	} else {
-		if (ex_buf - bufs < xbufcur && ex_buf - bufs >= 0) {
+		if (!istempbuf(ex_buf)) {
 			ex_tpbuf = ex_pbuf;
 			ex_pbuf = ex_buf;
 		}
@@ -395,7 +395,7 @@ static int ec_edit(char *loc, char *cmd, char *arg)
 	} else if (arg[0] || !xbufcur || !strchr(cmd, '!'))
 		bufs_switch(bufs_open(arg+cd));
 	readfile(rd =)
-	if (ex_buf - bufs < xbufcur && ex_buf - bufs >= 0) {
+	if (!istempbuf(ex_buf)) {
 		ex_bufpostfix(ex_buf - bufs, arg[0]);
 		syn_setft(ex_ft);
 		snprintf(msg, sizeof(msg), "\"%s\"  %d lines  [r]",

vi.c

@@ -807,9 +807,9 @@ static int vi_motion(int *row, int *off)
 			ex_krsset(cs, +1);
 			free(cs);
 		}
-		preserve(struct buf*, ex_buf, ex_buf)
+		struct buf* tmpex_buf = istempbuf(ex_buf) ? ex_pbuf : ex_buf;
 		if (mv == TK_CTL(']')) {
-			if (lkwdcnt != xkwdcnt)
+			if (vi_arg1 || lkwdcnt != xkwdcnt)
 				term_exec("qq", 4, /*nop*/, /*nop*/)
 			lkwdcnt = xkwdcnt;
 			fspos += fsdir < 0 ? 1 : 0;
@@ -1581,8 +1581,7 @@ void vi(int init)
 				vc_status();
 				break;
 			case TK_CTL('^'):
-				if (ex_pbuf - bufs < xbufcur && ex_pbuf - bufs >= 0)
-					bufs_switchwft(ex_pbuf - bufs)
+				bufs_switchwft(ex_pbuf - bufs)
 				vc_status();
 				vi_mod = 1;
 				break;

vi.h

@@ -299,6 +299,7 @@ extern struct buf *ex_buf;
 extern struct buf *ex_pbuf;
 extern struct buf *bufs;
 extern struct buf tempbufs[2];
+#define istempbuf(buf) (buf - bufs < 0 || buf - bufs >= xbufcur)
 #define EXLEN	512	/* ex line length */
 #define ex_path ex_buf->path
 #define ex_ft ex_buf->ft