View | Details | Raw Unified | Return to bug 21089 | Differences between
and this patch

Collapse All | Expand All

(-)common/gs.h (+1 lines)
Lines 144-149 struct _gs { Link Here
144
#define	G_SNAPSHOT	0x0040		/* Always snapshot files. */
144
#define	G_SNAPSHOT	0x0040		/* Always snapshot files. */
145
#define	G_SRESTART	0x0080		/* Screen restarted. */
145
#define	G_SRESTART	0x0080		/* Screen restarted. */
146
#define	G_TMP_INUSE	0x0100		/* Temporary buffer in use. */
146
#define	G_TMP_INUSE	0x0100		/* Temporary buffer in use. */
147
#define	G_RESIZE	0x0200		/* Resize requested. */
147
	u_int32_t flags;
148
	u_int32_t flags;
148
149
149
	/* Screen interface functions. */
150
	/* Screen interface functions. */
(-)common/key.c (+4 lines)
Lines 591-596 loop: if (gp->scr_event(sp, argp, Link Here
591
			if (LF_ISSET(EC_INTERRUPT))
591
			if (LF_ISSET(EC_INTERRUPT))
592
				return (0);
592
				return (0);
593
			goto append;
593
			goto append;
594
		case E_WRESIZE:
595
			/* Set the global resize flag. */
596
			F_SET(sp->gp, G_RESIZE);
597
			goto append;
594
		default:
598
		default:
595
append:			if (v_event_append(sp, argp))
599
append:			if (v_event_append(sp, argp))
596
				return (1);
600
				return (1);
(-)vi/v_txt.c (+6 lines)
Lines 92-97 v_tcmd(sp, vp, prompt, flags) Link Here
92
	if (O_ISSET(sp, O_TTYWERASE))
92
	if (O_ISSET(sp, O_TTYWERASE))
93
		LF_SET(TXT_TTYWERASE);
93
		LF_SET(TXT_TTYWERASE);
94
94
95
	F_CLR(sp->gp, G_RESIZE);
96
95
	/* Do the input thing. */
97
	/* Do the input thing. */
96
	if (v_txt(sp, vp, NULL, NULL, 0, prompt, 0, 1, flags))
98
	if (v_txt(sp, vp, NULL, NULL, 0, prompt, 0, 1, flags))
97
		return (1);
99
		return (1);
Lines 109-114 v_tcmd(sp, vp, prompt, flags) Link Here
109
	/* Set the cursor to the resulting position. */
111
	/* Set the cursor to the resulting position. */
110
	sp->lno = vp->m_final.lno;
112
	sp->lno = vp->m_final.lno;
111
	sp->cno = vp->m_final.cno;
113
	sp->cno = vp->m_final.cno;
114
115
	/* Abort the command on interrupt or window resize. */
116
	if (INTERRUPTED(sp) || F_ISSET(sp->gp, G_RESIZE))
117
		return (1);
112
118
113
	return (0);
119
	return (0);
114
}
120
}

Return to bug 21089