From e88f2bf20c8add61a392e30136b87c7c06fc62a3 Mon Sep 17 00:00:00 2001
From: Bakkeby <bakkeby@gmail.com>
Date: Thu, 7 Mar 2024 22:35:11 +0100
Subject: [PATCH] Removing the VIM browse patch.

The general reasoning is that the vim browse patch is very invasive,
has a high level of complexity, and is incompatible with a significant
number of other patches and it complicates further maintenance.

Additionally the patch has its own scrollback mechanism which seemingly
did not work properly - and nobody seems to have complained about this
since the patch was added back in May 2021.

If you want to try out the vim browse patch then I would recommend having
a play around with the patch author's own build that has this patch
integrated:
   - https://github.com/juliusHuelsmann/st-history-vim
   - https://github.com/juliusHuelsmann/st

Alternatively a tag has been added to this repository that refers to the
last commit that still has the vim browse patch:
   - https://github.com/bakkeby/st-flexipatch/tree/VIM_BROWSE_PATCH
---
 README.md              |  19 +-
 config.def.h           |  21 --
 patch/normalMode.c     | 284 -----------------------
 patch/normalMode.h     |   8 -
 patch/openurlonclick.c |  20 +-
 patch/st_include.c     |   3 -
 patch/st_include.h     |   3 -
 patch/x_include.h      |   3 -
 patches.def.h          |  10 -
 st.c                   | 514 ++---------------------------------------
 st.h                   |   8 +-
 win.h                  |   4 +-
 x.c                    |  81 +------
 13 files changed, 40 insertions(+), 938 deletions(-)
 delete mode 100644 patch/normalMode.c
 delete mode 100644 patch/normalMode.h

diff --git a/README.md b/README.md
index a4aa5cc..6a30338 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Similar to [dwm-flexipatch](https://github.com/bakkeby/dwm-flexipatch) this st 0.9 (a3f74203, 2024-02-18) project has a different take on st patching. It uses preprocessor directives to decide whether or not to include a patch during build time. Essentially this means that this build, for better or worse, contains both the patched _and_ the original code. The aim being that you can select which patches to include and the build will contain that code and nothing more.
+Similar to [dwm-flexipatch](https://github.com/bakkeby/dwm-flexipatch) this st 0.9 (95f22c5, 2024-03-04) project has a different take on st patching. It uses preprocessor directives to decide whether or not to include a patch during build time. Essentially this means that this build, for better or worse, contains both the patched _and_ the original code. The aim being that you can select which patches to include and the build will contain that code and nothing more.
 
 For example to include the `alpha` patch then you would only need to flip this setting from 0 to 1 in [patches.h](https://github.com/bakkeby/st-flexipatch/blob/master/patches.def.h):
 ```c
@@ -15,6 +15,8 @@ Refer to [https://st.suckless.org/](https://st.suckless.org/) for details on the
 
 ### Changelog:
 
+2024-03-07 - Improved sixel support, removed VIM browse patch
+
 2022-10-24 - Added the fullscreen patch
 
 2022-08-28 - Added the use XftFontMatch patch
@@ -278,11 +280,16 @@ Refer to [https://st.suckless.org/](https://st.suckless.org/) for details on the
    - [vertcenter](https://st.suckless.org/patches/vertcenter/)
       - vertically center lines in the space available if you have set a larger chscale in config.h
 
-   - [vim-browse](https://st.suckless.org/patches/vim_browse/)
-      - the vim-browse patch offers the possibility to move through the terminal history-buffer,
-        search for strings using VIM-like motions, operations and quantifiers
-      - it overlays the screen with highlighted search results and displays the current operation
-        / motions / search string in the bottom right corner
+   - [~vim-browse~](https://st.suckless.org/patches/vim_browse/)
+      - ~the vim-browse patch offers the possibility to move through the terminal history-buffer,~
+        ~search for strings using VIM-like motions, operations and quantifiers~
+      - ~it overlays the screen with highlighted search results and displays the current operation~
+        ~/ motions / search string in the bottom right corner~
+      - the VIM browse patch was removed due to sheer complexity and it being incompatible with a
+        significant number of other patches
+      - if you want to try this patch out then the recommendation is to play around with the
+        author's own build of st where this is properly implemented with history buffer (scrollback)
+      - https://github.com/juliusHuelsmann/st
 
    - [visualbell](https://st.suckless.org/patches/visualbell/)
       - adds visual indicators for the terminal bell event
diff --git a/config.def.h b/config.def.h
index ef52eb1..b8fe86e 100644
--- a/config.def.h
+++ b/config.def.h
@@ -222,24 +222,6 @@ unsigned int selectionbg = 259;
 static int ignoreselfg = 1;
 #endif // SELECTION_COLORS_PATCH
 
-#if VIM_BROWSE_PATCH
-unsigned int const currentBg = 6, buffSize = 2048;
-/// Enable double / triple click yanking / selection of word / line.
-int const mouseYank = 1, mouseSelect = 0;
-/// [Vim Browse] Colors for search results currently on screen.
-unsigned int const highlightBg = 160, highlightFg = 15;
-char const wDelS[] = "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~", wDelL[] = " \t";
-char *nmKeys [] = {              ///< Shortcusts executed in normal mode
-  "R/Building\nN", "r/Building\n", "X/juli@machine\nN", "x/juli@machine\n",
-  "Q?[Leaving vim, starting execution]\n","F/: error:\nN", "f/: error:\n", "DQf"
-};
-unsigned int const amountNmKeys = sizeof(nmKeys) / sizeof(*nmKeys);
-/// Style of the {command, search} string shown in the right corner (y,v,V,/)
-Glyph styleSearch = {' ', ATTR_ITALIC | ATTR_BOLD_FAINT, 7, 16};
-Glyph style[] = {{' ',ATTR_ITALIC|ATTR_FAINT,15,16}, {' ',ATTR_ITALIC,232,11},
-                 {' ', ATTR_ITALIC, 232, 4}, {' ', ATTR_ITALIC, 232, 12}};
-#endif // VIM_BROWSE_PATCH
-
 #if BLINKING_CURSOR_PATCH
 /*
  * https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h4-Functions-using-CSI-_-ordered-by-the-final-character-lparen-s-rparen:CSI-Ps-SP-q.1D81
@@ -456,9 +438,6 @@ static Shortcut shortcuts[] = {
 	#if INVERT_PATCH
 	{ TERMMOD,              XK_X,           invert,          { 0 } },
 	#endif // INVERT_PATCH
-	#if VIM_BROWSE_PATCH
-	{ MODKEY,               XK_c,           normalMode,      {.i =  0} },
-	#endif // VIM_BROWSE_PATCH
 };
 
 /*
diff --git a/patch/normalMode.c b/patch/normalMode.c
deleted file mode 100644
index bbc9cfb..0000000
--- a/patch/normalMode.c
+++ /dev/null
@@ -1,284 +0,0 @@
-#include <X11/keysym.h>
-#include <X11/XKBlib.h>
-
-#include "normalMode.h"
-#include "utils.h"
-
-extern Glyph const styleSearch, style[];
-extern char const wDelS[], wDelL[], *nmKeys[];
-extern unsigned int bg[], fg, currentBg, highlightBg, highlightFg, amountNmKeys;
-
-typedef struct { int p[3]; } Pos;
-
-typedef enum {visual='v', visualLine='V', yank = 'y'} Op;
-typedef enum {infix_none=0, infix_i='i', infix_a='a'} Infix;
-typedef enum {fw='/', bw='?'} Search;
-struct NormalModeState {
-	struct OperationState { Op op; Infix infix; } cmd;
-	struct MotionState { uint32_t c; int active; Pos searchPos; Search search; } m;
-} defaultNormalMode, state;
-
-DynamicArray searchStr=UTF8_ARRAY, cCmd=UTF8_ARRAY, lCmd=UTF8_ARRAY;
-Glyph styleCmd;
-char posBuffer[10], braces[6][3] = { {"()"}, {"<>"}, {"{}"}, {"[]"}, {"\"\""}, {"''"}};
-int exited=1, overlay=1;
-static inline Rune cChar() { return term.line[term.c.y][term.c.x].u; }
-static inline int pos(int p, int h) {return IS_SET(MODE_ALTSCREEN)?p:rangeY(p+h*histOff-insertOff);}
-static inline int contains(Rune l, char const * values, size_t const memSize) {
-	for (uint32_t i = 0; i < memSize; ++i) if (l == values[i]) return 1;
-	return 0;
-}
-static inline void decodeTo(char const *cs, size_t len, DynamicArray *arr) {
-	char *var = expand(arr);
-	if (!var) empty(arr); else utf8decode(cs, (Rune*)(var), len);
-}
-static inline void applyPos(Pos p) {
-	term.c.x = p.p[0], term.c.y = p.p[1];
-	if (!IS_SET(MODE_ALTSCREEN) && histOp) term.line = &buf[histOff = p.p[2]];
-}
-/// Find string in history buffer, and provide string-match-lookup for highlighting matches
-static int highlighted(int x, int y) {
-	int const s=term.row*term.col, i=y*term.col+x, sz=size(&searchStr);
-	return sz && i<s && mark[i]!=sz && i+mark[i]<s && !mark[i+mark[i]];
-}
-static void markSearchMatches(int all) {
-	int sz = size(&searchStr), ox = 0, oy = 0, oi=0;
-	for (int y=0; sz && all && y<term.row; ++y)
-		for (int x=0; x<term.col; ++x) term.dirty[y] |= highlighted(x, y);
-	for (int y = 0, wi=0, owi=0, i=0; sz && y < term.row; ++y)
-		for (int x=0; x<term.col; ++x, wi%=sz, ++i, owi=wi)
-			if (all || term.dirty[y]) {
-				mark[i]=sz-(wi=(getU32(&searchStr,wi,1)==term.line[y][x].u?wi+1:0));
-				if (wi==1) ox=x, oy=y, oi=i; else if (!wi && owi) x=ox, y=oy, i=oi;
-			}
-	for (int y=0; sz &&all &&y<term.row; ++y)
-		for (int x=0; x<term.col; ++x) term.dirty[y] |= highlighted(x, y);
-}
-static int findString(int s, int all) {
-	Pos p = (Pos) {.p={term.c.x, term.c.y, IS_SET(MODE_ALTSCREEN) ? 0 : histOff}};
-	historyMove(s, 0, 0);
-	uint32_t strSz=size(&searchStr), maxIter=rows()*term.col+strSz, wIdx=0;
-	for (uint32_t i=0, wi = 0; wIdx<strSz && ++i<=maxIter; historyMove(s, 0, 0), wi=wIdx) {
-		wIdx = (getU32(&searchStr, wIdx, s>0)==cChar())?wIdx+1:0;
-		if (wi && !wIdx) historyMove(-(int)(s*wi), 0, 0);
-	}
-	if (wIdx == strSz && wIdx) historyMove(-(int)(s*strSz), 0, 0);
-	else applyPos(p);
-	markSearchMatches(all);
-	return wIdx == strSz;
-}
-/// Execute series of normal-mode commands from char array / decoded from dynamic array
-ExitState pressKeys(char const* s, size_t e) {
-	ExitState x=success;
-	for (size_t i=0; i<e && (x=(!s[i] ? x : kPressHist(&s[i], 1, 0, NULL))); ++i);
-	return x;
-}
-static ExitState executeCommand(uint32_t *cs, size_t z) {
-	ExitState x=success;
-	char dc [32];
-	for (size_t i=0; i<z && (x=kPressHist(dc, utf8encode(cs[i],dc),0,NULL));++i);
-	return x;
-}
-/// Get character for overlay, if the overlay (st) has something to show, else normal char.
-static void getChar(DynamicArray *st, Glyph *glyphChange, int y, int xEnd, int width, int x) {
-	if (x < xEnd - min(min(width,xEnd), size(st))) *glyphChange = term.line[y][x];
-	else if (x<xEnd) glyphChange->u = *((Rune*)(st->content + (size(st)+x-xEnd)*st->elSize));
-}
-/// Expand "infix" expression: for instance (w =>)       l     b     |   | v     e    |   | y
-static ExitState expandExpression(char l) { //    ({ =>)       l  ?  {  \n | l | v  /  } \n | h | y
-	int a=state.cmd.infix==infix_a, yank=state.cmd.op=='y', lc=tolower(l), found=1;
-	state.cmd.infix = infix_none;
-	if(!yank && state.cmd.op!=visual && state.cmd.op!=visualLine) return failed;
-	char mot[11] = {'l', 0, 'b', 0, 0, 'v', 0, 'e', 0, 0, (char)(yank ? 'y' : 0)};
-	if (lc == 'w') mot[2] = (char) ('b' - lc + l), mot[7] = (char) ((a ? 'w' : 'e') - lc + l), mot[9]=(char)(a?'h':0);
-	else {
-		mot[1]='?', mot[3]=mot[8]='\n', mot[6]='/', mot[4]=(char)(a?0:'l'), mot[9]=(char)(a?0:'h');
-		for (int i=found=0; !found && i < 6; ++i)
-			if ((found=contains(l,braces[i],2))) mot[2]=braces[i][0], mot[7]=braces[i][1];
-	}
-	if (!found) return failed;
-	assign(&lCmd, &cCmd);
-	empty(&cCmd);
-	state.cmd = defaultNormalMode.cmd;
-	return pressKeys(mot, 11);
-}
-
-ExitState executeMotion(char const cs, KeySym const *const ks) {
-	state.m.c = state.m.c < 1u ? 1u : state.m.c;
-	if      (ks && *ks == XK_d) historyMove(0, 0, term.row / 2);
-	else if (ks && *ks == XK_u) historyMove(0, 0, -term.row / 2);
-	else if (ks && *ks == XK_f) historyMove(0, 0, term.row-1+(term.c.y=0));
-	else if (ks && *ks == XK_b) historyMove(0, 0, -(term.c.y=term.row-1));
-	else if (ks && *ks == XK_h) overlay = !overlay;
-	else if (cs == 'K') historyMove(0, 0, -(int)state.m.c);
-	else if (cs == 'J') historyMove(0, 0,  (int)state.m.c);
-	else if (cs == 'k') historyMove(0, -(int)state.m.c, 0);
-	else if (cs == 'j') historyMove(0,  (int)state.m.c, 0);
-	else if (cs == 'h') historyMove(-(int)state.m.c, 0, 0);
-	else if (cs == 'l') historyMove( (int)state.m.c, 0, 0);
-	else if (cs == 'H') term.c.y = 0;
-	else if (cs == 'M') term.c.y = term.bot / 2;
-	else if (cs == 'L') term.c.y = term.bot;
-	else if (cs == 's' || cs == 'S') altToggle = cs == 's' ? !altToggle : 1;
-	else if (cs == 'G' || cs == 'g') {
-		if (cs == 'G') term.c = c[0] = c[IS_SET(MODE_ALTSCREEN)+1];
-		if (!IS_SET(MODE_ALTSCREEN)) term.line = &buf[histOff=insertOff];
-	} else if (cs == '0') term.c.x = 0;
-	else if (cs == '$') term.c.x = term.col-1;
-	else if (cs == 't') sel.type = sel.type==SEL_REGULAR ? SEL_RECTANGULAR : SEL_REGULAR;
-	else if (cs == 'n' || cs == 'N') {
-		int const d = ((cs=='N')!=(state.m.search==bw))?-1:1;
-		for (uint32_t i = state.m.c; i && findString(d, 0); --i);
-	} else if (contains(cs, "wWeEbB", 6)) {
-		int const low=cs<=90, off=tolower(cs)!='w', sgn=(tolower(cs)=='b')?-1:1;
-		size_t const l=strlen(wDelL), s=strlen(wDelS), maxIt=rows()*term.col;
-		for (int it=0, on=0; state.m.c > 0 && it < maxIt; ++it) {
-		    // If an offset is to be performed in beginning or not in beginning, move in history.
-			if ((off || it) && historyMove(sgn, 0, 0)) break;
-			// Determine if the category of the current letter changed since last iteration.
-			int n = 1<<(contains(cChar(),wDelS,s) ?(2-low) :!contains(cChar(),wDelL,l)),
-			    found = (on|=n)^n && ((off ?on^n :n)!=1);
-			// If a reverse offset is to be performed and this is the last letter:
-			if (found && off) historyMove(-sgn, 0, 0);
-			// Terminate iteration: reset #it and old n value #on and decrease operation count:
-			if (found) it=-1, on=0, --state.m.c;
-		}
-	} else return failed;
-	state.m.c = 0;
-	return state.cmd.op == yank ? exitMotion : success;
-}
-
-ExitState kPressHist(char const *cs, size_t len, int ctrl, KeySym const *kSym) {
-	historyOpToggle(1, 1);
-	int const prevYOff=IS_SET(MODE_ALTSCREEN)?0:histOff, search=state.m.search&&state.m.active,
-	          prevAltToggle=altToggle, prevOverlay=overlay;
-	int const noOp=!state.cmd.op&&!state.cmd.infix, num=len==1&&BETWEEN(cs[0],48,57),
-	          esc=kSym&&*kSym==XK_Escape, ret=(kSym&&*kSym==XK_Return)||(len==1&&cs[0]=='\n'),
-	          quantifier=num&&(cs[0]!='0'||state.m.c), ins=!search &&noOp &&len &&cs[0]=='i';
-	exited = 0;
-	ExitState result = success;
-	if (esc || ret || ins) { result = exitMotion, len = 0;
-	} else if (kSym && *kSym == XK_BackSpace) {
-		if ((search || state.m.c) && size(&cCmd)) pop(&cCmd);
-		if (search) {
-			if (size(&searchStr)) pop(&searchStr);
-			else result = exitMotion;
-			if (!size(&searchStr)) tfulldirt();
-			applyPos(state.m.searchPos);
-			findString(state.m.search==fw ? 1 : -1, 1);
-		} else if (state.m.c) state.m.c /= 10;
-		len = 0;
-	} else if (search) {
-		if (len >= 1) decodeTo(cs, len, &searchStr);
-		applyPos(state.m.searchPos);
-		findString(state.m.search==fw ? 1 : -1, 1);
-	} else if (len == 0) { result = failed;
-	} else if (quantifier) { state.m.c = min(SHRT_MAX, (int)state.m.c*10+cs[0]-48);
-	} else if (state.cmd.infix && state.cmd.op && (result = expandExpression(cs[0]), len=0)) {
-    } else if (cs[0] == 'd') { state = defaultNormalMode; result = exitMotion; state.m.active = 1;
-	} else if (cs[0] == '.') {
-		if (size(&cCmd)) assign(&lCmd, &cCmd);
-		empty(&cCmd);
-		executeCommand((uint32_t*) lCmd.content, size(&lCmd));
-		empty(&cCmd);
-		len = 0;
-	} else if (cs[0] == 'r') { tfulldirt();
-	} else if (cs[0] == 'c') {
-		empty(&lCmd);
-		empty(&cCmd);
-		empty(&searchStr);
-		tfulldirt();
-		len = 0;
-	} else if (cs[0] == fw || cs[0] == bw) {
-		empty(&searchStr);
-		state.m.search = (Search) cs[0];
-		state.m.searchPos = (Pos){.p={term.c.x, term.c.y, prevYOff}};
-		state.m.active = 1;
-	} else if (cs[0]==infix_i || cs[0]==infix_a) { state.cmd.infix=(Infix) cs[0];
-	} else if (cs[0] == 'y') {
-		if (state.cmd.op) {
-			result = (state.cmd.op == yank || state.cmd.op == visualLine) ? exitOp : exitMotion;
-			if (state.cmd.op == yank) selstart(0, term.c.y, 0);
-		} else selstart(term.c.x, term.c.y, 0);
-		state.cmd.op = yank;
-	} else if (cs[0] == visual || cs[0] == visualLine) {
-		if (state.cmd.op != (Op) cs[0]) {
-			state.cmd = defaultNormalMode.cmd;
-			state.cmd.op = (Op) cs[0];
-			selstart(cs[0] == visualLine ?0 :term.c.x, term.c.y, 0);
-		} else result = exitOp;
-	} else if (!(result =executeMotion((char) (len?cs[0]:0), ctrl?kSym:NULL))) {
-		result=failed;
-		for (size_t i = 0; !ctrl && i < amountNmKeys; ++i)
-			if (cs[0]==nmKeys[i][0] &&
-			   failed!=(result=pressKeys(&nmKeys[i][1], strlen(nmKeys[i])-1))) goto end;
-	} // Operation/Motion finished if valid: update cmd string, extend selection, update search
-	if (result != failed) {
-		if (len == 1 && !ctrl) decodeTo(cs, len, &cCmd);
-		if ((state.cmd.op == visualLine) || ((state.cmd.op == yank) && (result == exitOp))) {
-			int const off = term.c.y + (IS_SET(MODE_ALTSCREEN) ? 0 : histOff) < sel.ob.y; //< Selection start below end.
-			sel.ob.x = off ? term.col - 1 : 0;
-			selextend(off ? 0 : term.col-1, term.c.y, sel.type, 0);
-		} else if (sel.oe.x != -1) {
-			selextend(term.c.x, term.c.y, sel.type, 0);
-		}
-	} // Set repaint for motion or status bar
-	if (!IS_SET(MODE_ALTSCREEN) && prevYOff != histOff) tfulldirt();
-	// Terminate Motion / operation if thus indicated
-	if (result == exitMotion) {
-		if (!state.m.active) result = (exited=noOp) ? finish : exitOp;
-		 state.m.active = (int) (state.m.c = 0u);
-	}
-	if (result == exitOp || result == finish) {
-		if (state.cmd.op == yank) {
-			xsetsel(getsel());
-			xclipcopy();
-		}
-		state = defaultNormalMode;
-		selclear();
-		if (!esc) assign(&lCmd, &cCmd);
-		empty(&cCmd);
-	} // Update the content displayed in the history overlay
-	styleCmd = style[state.cmd.op==yank ? 1 : (state.cmd.op==visual ? 2 :
-	                (state.cmd.op==visualLine ? 3 :0))];
-	int const posLin = !IS_SET(MODE_ALTSCREEN) ? rangeY(insertOff-histOff):0, h=rows()-term.row;
-	if (!posLin || posLin==h || !h) strcpy(posBuffer, posLin ? " [BOT] " : " [TOP] ");
-	else sprintf(posBuffer, " % 3d%c  ", min(100, max(0, (int)(.5 + posLin * 100. / h))),'%');
-	if ((overlay || overlay!=prevOverlay) && term.col>9 && term.row>4) {
-		if (!term.dirty[term.row-1]) xdrawline(term.line[term.row-1], term.col*2/3, term.row-1, term.col-1);
-		if (!term.dirty[term.row-2]) xdrawline(term.line[term.row-2], term.col*2/3, term.row-2, term.col-1);
-	}
-	if (result==finish) altToggle = 0;
-	if (altToggle != prevAltToggle) tswapscreen();
-end:
-	historyOpToggle(-1, 1);
-	return result;
-}
-
-void historyOverlay(int x, int y, Glyph* g) {
-	if (!histMode) return;
-	TCursor const *cHist = histOp ? &term.c : &c[0];
-	if(overlay && term.col > 9 && term.row > 4 && (x > (2*term.col/3)) && (y >= (term.row-2))) {
-		*g = (y == term.row - 2) ? styleSearch : styleCmd;
-		if (y == term.row-2) getChar(&searchStr, g, term.row-2, term.col-2, term.col/3, x);
-		else if (x > term.col - 7) g->u = (Rune)(posBuffer[x - term.col + 7]);
-		else getChar(size(&cCmd) ?&cCmd :&lCmd, g, term.row-1, term.col-7, term.col/3-6, x);
-	} else if (highlighted(x, y)) g->bg = highlightBg, g->fg = highlightFg;
-	else if ((x==cHist->x) ^ (y==cHist->y)) g->bg = currentBg;
-	else if (x==cHist->x) g->mode^=ATTR_REVERSE;
-}
-void historyPreDraw() {
-	static Pos op = {.p={0, 0, 0}};
-	historyOpToggle(1, 0);
-	// Draw the cursor cross if changed
-	if (term.c.y >= term.row || op.p[1] >= term.row) tfulldirt();
-	else if (exited || (op.p[1] != term.c.y)) term.dirty[term.c.y] = term.dirty[op.p[1]] = 1;
-	for (int i=0; (exited || term.c.x != op.p[0]) && i<term.row; ++i) if (!term.dirty[i]) {
-		xdrawline(term.line[i], term.c.x, i, term.c.x + 1);
-		xdrawline(term.line[i], op.p[0], i, op.p[0] + 1);
-	}
-	// Update search results either only for lines with new content or all results if exiting
-	markSearchMatches(exited);
-	op = (Pos){.p = {term.c.x, term.c.y, 0}};
-	historyOpToggle(-1, 0);
-}
\ No newline at end of file
diff --git a/patch/normalMode.h b/patch/normalMode.h
deleted file mode 100644
index d910dca..0000000
--- a/patch/normalMode.h
+++ /dev/null
@@ -1,8 +0,0 @@
-void normalMode();
-void historyPreDraw();
-void historyOverlay(int x, int y, Glyph* g);
-void historyModeToggle(int start);
-void historyOpToggle(int, int);
-typedef enum {failed=0, success=1, exitMotion=2, exitOp=3, finish=4} ExitState;
-ExitState kPressHist(char const *txt, size_t len, int ctrl, KeySym const *kSym);
-ExitState pressKeys(char const* s, size_t e);
\ No newline at end of file
diff --git a/patch/openurlonclick.c b/patch/openurlonclick.c
index 626cde6..078550a 100644
--- a/patch/openurlonclick.c
+++ b/patch/openurlonclick.c
@@ -1,13 +1,9 @@
-#if SCROLLBACK_PATCH && !VIM_BROWSE_PATCH
+#if SCROLLBACK_PATCH
 #define TLINEURL(y) TLINE(y)
 #else
 #define TLINEURL(y) term.line[y]
 #endif // SCROLLBACK_PATCH
 
-#if VIM_BROWSE_PATCH
-extern int buffCols;
-#endif // VIM_BROWSE_PATCH
-
 int url_x1, url_y1, url_x2, url_y2 = -1;
 int url_draw, url_click, url_maxcol;
 
@@ -27,13 +23,11 @@ isvalidurlchar(Rune u)
 static int
 findeowl(int row)
 {
-	#if VIM_BROWSE_PATCH
-	int col = buffCols - 1;
-	#elif COLUMNS_PATCH
+	#if COLUMNS_PATCH
 	int col = term.maxcol - 1;
 	#else
 	int col = term.col - 1;
-	#endif // VIM_BROWSE_PATCH
+	#endif // COLUMNS_PATCH
 
 	do {
 		if (TLINEURL(row)[col].mode & ATTR_WRAP)
@@ -58,7 +52,7 @@ detecturl(int col, int row, int draw)
 	int row_start = row;
 	int col_start = col;
 	int i = sizeof(url)/2+1, j = sizeof(url)/2;
-	#if SCROLLBACK_PATCH && !VIM_BROWSE_PATCH
+	#if SCROLLBACK_PATCH
 	int minrow = term.scr - term.histn, maxrow = term.scr + term.row - 1;
 	/* Fixme: MODE_ALTSCREEN is not defined here, I had to use the magic number 1<<2 */
 	if ((term.mode & (1 << 2)) != 0)
@@ -96,13 +90,11 @@ detecturl(int col, int row, int draw)
 		url_maxcol = MAX(url_maxcol, x2);
 		url[j++] = TLINEURL(row)[col].u;
 		wrapped = TLINEURL(row)[col].mode & ATTR_WRAP;
-		#if VIM_BROWSE_PATCH
-		if (++col >= buffCols || wrapped) {
-		#elif COLUMNS_PATCH
+		#if COLUMNS_PATCH
 		if (++col >= term.maxcol || wrapped) {
 		#else
 		if (++col >= term.col || wrapped) {
-		#endif // VIM_BROWSE_PATCH
+		#endif // COLUMNS_PATCH
 			col = 0;
 			if (++row > maxrow || !wrapped)
 				break;
diff --git a/patch/st_include.c b/patch/st_include.c
index 726aad0..3a8c3c1 100644
--- a/patch/st_include.c
+++ b/patch/st_include.c
@@ -23,6 +23,3 @@
 #if SYNC_PATCH
 #include "sync.c"
 #endif
-#if VIM_BROWSE_PATCH
-#include "normalMode.c"
-#endif
\ No newline at end of file
diff --git a/patch/st_include.h b/patch/st_include.h
index 5f339c0..2572987 100644
--- a/patch/st_include.h
+++ b/patch/st_include.h
@@ -26,6 +26,3 @@
 #if SYNC_PATCH
 #include "sync.h"
 #endif
-// #if VIM_BROWSE_PATCH
-// #include "normalMode.h"
-// #endif
diff --git a/patch/x_include.h b/patch/x_include.h
index 6505909..cbfd6d4 100644
--- a/patch/x_include.h
+++ b/patch/x_include.h
@@ -35,6 +35,3 @@
 #if XRESOURCES_PATCH
 #include "xresources.h"
 #endif
-#if VIM_BROWSE_PATCH
-#include "normalMode.h"
-#endif
diff --git a/patches.def.h b/patches.def.h
index 2150443..98a271c 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -406,16 +406,6 @@
  */
 #define VERTCENTER_PATCH 0
 
-/* The vim-browse patch offers the possibility to move through the terminal history-buffer,
- * search for strings using VIM-like motions, operations and quantifiers. It overlays the
- * screen with highlighted search results and displays the current operation / motions / search
- * string in the bottom right corner.
- *
- * https://github.com/juliusHuelsmann/st-history-vim
- * https://st.suckless.org/patches/vim_browse/
- */
-#define VIM_BROWSE_PATCH 0
-
 /* Briefly inverts window content on terminal bell event.
  * https://st.suckless.org/patches/visualbell/
  */
diff --git a/st.c b/st.c
index d6fad11..4d6d09b 100644
--- a/st.c
+++ b/st.c
@@ -21,10 +21,6 @@
 #include "st.h"
 #include "win.h"
 
-#if VIM_BROWSE_PATCH
-#include <assert.h>
-#endif // VIM_BROWSE_PATCH
-
 #if KEYBOARDSELECT_PATCH
 #include <X11/keysym.h>
 #include <X11/X.h>
@@ -59,10 +55,6 @@
 #define ISCONTROLC1(c)  (BETWEEN(c, 0x80, 0x9f))
 #define ISCONTROL(c)    (ISCONTROLC0(c) || ISCONTROLC1(c))
 #define ISDELIM(u)      (u && wcschr(worddelimiters, u))
-#if VIM_BROWSE_PATCH
-static inline int max(int a, int b) { return a > b ? a : b; }
-static inline int min(int a, int b) { return a < b ? a : b; }
-#endif // VIM_BROWSE_PATCH
 
 enum term_mode {
 	MODE_WRAP         = 1 << 0,
@@ -117,9 +109,6 @@ typedef struct {
 	int mode;
 	int type;
 	int snap;
-	#if VIM_BROWSE_PATCH
-	int swap;
-	#endif // VIM_BROWSE_PATCH
 	/*
 	 * Selection variables:
 	 * nb – normalized coordinates of the beginning of the selection
@@ -196,9 +185,7 @@ static void tdeleteline(int);
 static void tinsertblank(int);
 static void tinsertblankline(int);
 static int tlinelen(int);
-#if !VIM_BROWSE_PATCH
 static void tmoveto(int, int);
-#endif // VIM_BROWSE_PATCH
 static void tmoveato(int, int);
 static void tnewline(int);
 static void tputtab(int);
@@ -225,9 +212,7 @@ static void tdeftran(char);
 static void tstrsequence(uchar);
 static void selnormalize(void);
 static void selscroll(int, int);
-#if !VIM_BROWSE_PATCH
 static void selsnap(int *, int *, int);
-#endif // VIM_BROWSE_PATCH
 
 static size_t utf8decode(const char *, Rune *, size_t);
 static Rune utf8decodebyte(char, size_t *);
@@ -258,16 +243,6 @@ static const uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
 static const Rune utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
 static const Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
 
-#if VIM_BROWSE_PATCH
-int buffCols;
-extern int const buffSize;
-int histOp, histMode, histOff, insertOff, altToggle, *mark;
-Line *buf = NULL;
-static TCursor c[3];
-static inline int rows() { return IS_SET(MODE_ALTSCREEN) ? term.row : buffSize;}
-static inline int rangeY(int i) { while (i < 0) i += rows(); return i % rows();}
-#endif // VIM_BROWSE_PATCH
-
 #include "patch/st_include.h"
 
 ssize_t
@@ -463,118 +438,6 @@ tlinelen(int y)
 	return i;
 }
 
-#if VIM_BROWSE_PATCH
-void historyOpToggle(int start, int paint) {
-	if ((!histOp == !(histOp + start)) && ((histOp += start) || 1)) return;
-	if (histMode && paint && (!IS_SET(MODE_ALTSCREEN) || altToggle)) draw();
-	tcursor(CURSOR_SAVE);
-	histOp += start;
-	if (histMode && altToggle) {
-		tswapscreen();
-		memset(term.dirty,0,sizeof(*term.dirty)*term.row);
-	}
-	tcursor(CURSOR_LOAD);
-	*(!IS_SET(MODE_ALTSCREEN)?&term.line:&term.alt)=&buf[histOp?histOff:insertOff];
-}
-
-void historyModeToggle(int start) {
-	if (!(histMode = (histOp = !!start))) {
-		selnormalize();
-		tfulldirt();
-	} else {
-		tcursor(CURSOR_SAVE);
-		histOp = 0;
-		histOff = insertOff;
-	}
-}
-
-int historyBufferScroll(int n) {
-	if (IS_SET(MODE_ALTSCREEN) || !n) return histOp;
-	int p=abs(n=(n<0) ? max(n,-term.row) : min(n,term.row)), r=term.row-p,
-	          s=sizeof(*term.dirty), *ptr=histOp?&histOff:&insertOff;
-	if (!histMode || histOp) tfulldirt(); else {
-		memmove(&term.dirty[-min(n,0)], &term.dirty[max(n,0)], s*r);
-		memset(&term.dirty[n>0 ? r : 0], 0, s * p);
-	}
-	term.line = &buf[*ptr = (buffSize+*ptr+n) % buffSize];
-	// Cut part of selection removed from buffer, and update sel.ne/b.
-	int const prevOffBuf = sel.alt ? 0 : insertOff + term.row;
-	if (sel.ob.x != -1 && !histOp && n) {
-		int const offBuf = sel.alt ? 0 : insertOff + term.row,
-		          pb = rangeY(sel.ob.y - prevOffBuf),
-		          pe = rangeY(sel.oe.y - prevOffBuf);
-		int const b = rangeY(sel.ob.y - offBuf), nln = n < 0,
-		          e = rangeY(sel.oe.y - offBuf), last = offBuf - nln;
-		if (pb != b && ((pb < b) != nln)) sel.ob.y = last;
-		if (pe != e && ((pe < e) != nln)) sel.oe.y = last;
-		if (sel.oe.y == last && sel.ob.y == last) selclear();
-	}
-	selnormalize();
-  // Clear the new region exposed by the shift.
-	if (!histOp) tclearregion(0, n>0?r+1:0, buffCols-1, n>0?term.row:p-1);
-	return 1;
-}
-
-int historyMove(int x, int y, int ly) {
-	historyOpToggle(1, 1);
-	y += ((term.c.x += x) < 0 ?term.c.x-term.col :term.c.x) / term.col;//< x
-	if ((term.c.x %= term.col) < 0) term.c.x += term.col;
-	if ((term.c.y += y) >= term.row) ly += term.c.y - term.row + 1;    //< y
-	else if (term.c.y < 0) ly += term.c.y;
-	term.c.y = MIN(MAX(term.c.y, 0), term.row - 1);
-	// Check if scroll is necessary / arrived at top / bottom of terminal history
-	int t = 0, b = 0, finTop = ly < 0, finBot = ly > 0;
-	if (!IS_SET(MODE_ALTSCREEN)) {
-		b=rangeY(insertOff-histOff), t=-rangeY(-term.row-(insertOff-histOff));
-		finBot = ly > b, finTop=histMode&&((-ly>-t));
-	}
-	if ((finTop || finBot) && (x||y)) term.c.x = finBot ? term.col-1 : 0;
-	historyBufferScroll(finBot ? b : (finTop ? t : ly));
-	historyOpToggle(-1, 1);
-	return finTop || finBot;
-}
-
-void selnormalize(void) {
-	historyOpToggle(1, 1);
-
-	int const oldb = sel.nb.y, olde = sel.ne.y;
-	if (sel.ob.x == -1) {
-		sel.ne.y = sel.nb.y = -1;
-	} else {
-		int const offsetBuffer = sel.alt ? 0 : insertOff + term.row;
-		int const off = sel.alt ? 0 : (histMode ? histOff : insertOff);
-		int const nby = rangeY(sel.ob.y - off),
-		          ney = rangeY(sel.oe.y - off);
-		sel.swap = rangeY(sel.ob.y - offsetBuffer)
-		         > rangeY(sel.oe.y - offsetBuffer);
-		sel.nb.y = sel.swap ? ney : nby;
-		sel.ne.y = !sel.swap ? ney : nby;
-		int const cnb = sel.nb.y < term.row, cne = sel.ne.y < term.row;
-		if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) {
-			if (cnb) sel.nb.x = (!sel.swap) ? sel.ob.x : sel.oe.x;
-			if (cne) sel.ne.x = (!sel.swap) ? sel.oe.x : sel.ob.x;
-		} else {
-			if (cnb) sel.nb.x = MIN(sel.ob.x, sel.oe.x);
-			if (cne) sel.ne.x = MAX(sel.ob.x, sel.oe.x);
-		}
-	}
-	int const nBet=sel.nb.y<=sel.ne.y, oBet=oldb<=olde;
-	for (int i = 0; i < term.row; ++i) {
-		int const n = nBet ? BETWEEN(i, sel.nb.y, sel.ne.y)
-		                   : OUT(i, sel.nb.y, sel.ne.y);
-		term.dirty[i] |= (sel.type == SEL_RECTANGULAR && n) ||
-		        (n != (oBet ? BETWEEN(i,oldb,olde) : OUT(i,oldb,olde)));
-
-	}
-	if (BETWEEN(oldb, 0, term.row - 1)) term.dirty[oldb] = 1;
-	if (BETWEEN(olde, 0, term.row - 1)) term.dirty[olde] = 1;
-	if (BETWEEN(sel.nb.y, 0, term.row - 1)) term.dirty[sel.nb.y] = 1;
-	if (BETWEEN(sel.ne.y, 0, term.row - 1)) term.dirty[sel.ne.y] = 1;
-
-	historyOpToggle(-1, 1);
-}
-#endif // VIM_BROWSE_PATCH
-
 void
 selstart(int col, int row, int snap)
 {
@@ -584,27 +447,14 @@ selstart(int col, int row, int snap)
 	sel.alt = IS_SET(MODE_ALTSCREEN);
 	sel.snap = snap;
 	sel.oe.x = sel.ob.x = col;
-	#if VIM_BROWSE_PATCH
-	sel.oe.y = sel.ob.y = row + !sel.alt * (histMode ? histOff : insertOff);
-	if (sel.snap != 0) sel.mode = SEL_READY;
-	#else
 	sel.oe.y = sel.ob.y = row;
-	#endif // VIM_BROWSE_PATCH
 	selnormalize();
-
-	#if !VIM_BROWSE_PATCH
-	if (sel.snap != 0)
-		sel.mode = SEL_READY;
-	tsetdirt(sel.nb.y, sel.ne.y);
-	#endif // VIM_BROWSE_PATCH
 }
 
 void
 selextend(int col, int row, int type, int done)
 {
-	#if !VIM_BROWSE_PATCH
 	int oldey, oldex, oldsby, oldsey, oldtype;
-	#endif // VIM_BROWSE_PATCH
 
 	if (sel.mode == SEL_IDLE)
 		return;
@@ -613,32 +463,23 @@ selextend(int col, int row, int type, int done)
 		return;
 	}
 
-	#if !VIM_BROWSE_PATCH
 	oldey = sel.oe.y;
 	oldex = sel.oe.x;
 	oldsby = sel.nb.y;
 	oldsey = sel.ne.y;
 	oldtype = sel.type;
-	#endif // VIM_BROWSE_PATCH
 
 	sel.oe.x = col;
-	#if VIM_BROWSE_PATCH
-	sel.oe.y = row + (sel.alt ? 0 : (histMode ? histOff : insertOff));
-	#else
 	sel.oe.y = row;
-	#endif // VIM_BROWSE_PATCH
 	selnormalize();
 	sel.type = type;
 
-	#if !VIM_BROWSE_PATCH
 	if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type || sel.mode == SEL_EMPTY)
 		tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
-	#endif // VIM_BROWSE_PATCH
 
 	sel.mode = done ? SEL_IDLE : SEL_READY;
 }
 
-#if !VIM_BROWSE_PATCH
 void
 selnormalize(void)
 {
@@ -666,7 +507,6 @@ selnormalize(void)
 	if (tlinelen(sel.ne.y) <= sel.ne.x)
 		sel.ne.x = term.col - 1;
 }
-#endif // VIM_BROWSE_PATCH
 
 int
 selected(int x, int y)
@@ -679,19 +519,11 @@ selected(int x, int y)
 		return BETWEEN(y, sel.nb.y, sel.ne.y)
 		    && BETWEEN(x, sel.nb.x, sel.ne.x);
 
-	#if VIM_BROWSE_PATCH
-	return ((sel.nb.y > sel.ne.y) ? OUT(y, sel.nb.y, sel.ne.y)
-	                              : BETWEEN(y, sel.nb.y, sel.ne.y)) &&
-	       (y != sel.nb.y || x >= sel.nb.x) &&
-	       (y != sel.ne.y || x <= sel.ne.x);
-	#else
 	return BETWEEN(y, sel.nb.y, sel.ne.y)
 	    && (y != sel.nb.y || x >= sel.nb.x)
 	    && (y != sel.ne.y || x <= sel.ne.x);
-	#endif // VIM_BROWSE_PATCH
 }
 
-#if !VIM_BROWSE_PATCH
 void
 selsnap(int *x, int *y, int direction)
 {
@@ -784,87 +616,50 @@ selsnap(int *x, int *y, int direction)
 		break;
 	}
 }
-#endif // VIM_BROWSE_PATCH
 
 char *
 getsel(void)
 {
 	char *str, *ptr;
-	#if VIM_BROWSE_PATCH
-	int y, yy, bufsize, lastx;
-	#else
 	int y, bufsize, lastx, linelen;
-	#endif // VIM_BROWSE_PATCH
 	const Glyph *gp, *last;
 
 	if (sel.ob.x == -1)
 		return NULL;
 
-	#if VIM_BROWSE_PATCH
-	int const start = sel.swap ? sel.oe.y : sel.ob.y, h = rows();
-	int endy = (sel.swap ? sel.ob.y : sel.oe.y);
-	for (; endy < start; endy += h);
-	Line * const cbuf = IS_SET(MODE_ALTSCREEN) ? term.line : buf;
-	bufsize = (term.col+1) * (endy-start+1 ) * UTF_SIZ;
-	assert(bufsize > 0);
-	#else
 	bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ;
-	#endif // VIM_BROWSE_PATCH
 	ptr = str = xmalloc(bufsize);
 
 	/* append every set & selected glyph to the selection */
-	#if VIM_BROWSE_PATCH
-	for (y = start; y <= endy; y++)
-	#else
 	for (y = sel.nb.y; y <= sel.ne.y; y++)
-	#endif // VIM_BROWSE_PATCH
 	{
-		#if VIM_BROWSE_PATCH
-		yy = y % h;
-		#else
 		if ((linelen = tlinelen(y)) == 0) {
 			*ptr++ = '\n';
 			continue;
 		}
-		#endif // VIM_BROWSE_PATCH
 
 		if (sel.type == SEL_RECTANGULAR) {
-			#if VIM_BROWSE_PATCH
-			gp = &cbuf[yy][sel.nb.x];
-			#elif SCROLLBACK_PATCH
+			#if SCROLLBACK_PATCH
 			gp = &TLINE(y)[sel.nb.x];
 			#else
 			gp = &term.line[y][sel.nb.x];
 			#endif // SCROLLBACK_PATCH
 			lastx = sel.ne.x;
 		} else {
-			#if VIM_BROWSE_PATCH
-			gp = &cbuf[yy][start == y ? sel.nb.x : 0];
-			#elif SCROLLBACK_PATCH
+			#if SCROLLBACK_PATCH
 			gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];
 			#else
 			gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
 			#endif // SCROLLBACK_PATCH
-			#if VIM_BROWSE_PATCH
-			lastx = (endy == y) ? sel.ne.x : term.col-1;
-			#else
 			lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
-			#endif // VIM_BROWSE_PATCH
 		}
-		#if VIM_BROWSE_PATCH
-		last = &cbuf[yy][lastx];
-		#elif SCROLLBACK_PATCH
+		#if SCROLLBACK_PATCH
 		last = &TLINE(y)[MIN(lastx, linelen-1)];
 		#else
 		last = &term.line[y][MIN(lastx, linelen-1)];
 		#endif // SCROLLBACK_PATCH
-		#if VIM_BROWSE_PATCH
-		if (!(cbuf[yy][term.col - 1].mode & ATTR_WRAP))
-			while (last > gp && last->u == ' ') --last;
-		#else
 		while (last >= gp && last->u == ' ')
 			--last;
-		#endif // VIM_BROWSE_PATCH
 
 		for ( ; gp <= last; ++gp) {
 			if (gp->mode & ATTR_WDUMMY)
@@ -882,12 +677,7 @@ getsel(void)
 		 * st.
 		 * FIXME: Fix the computer world.
 		 */
-		if (
-		#if VIM_BROWSE_PATCH
-			(y < endy || lastx == term.col - 1)
-		#else
-			(y < sel.ne.y || lastx >= linelen)
-		#endif //
+		if ((y < sel.ne.y || lastx >= linelen)
 		    && (!(last->mode & ATTR_WRAP) || sel.type == SEL_RECTANGULAR))
 			*ptr++ = '\n';
 	}
@@ -902,11 +692,7 @@ selclear(void)
 		return;
 	sel.mode = SEL_IDLE;
 	sel.ob.x = -1;
-	#if VIM_BROWSE_PATCH
-	selnormalize();
-	#else
 	tsetdirt(sel.nb.y, sel.ne.y);
-	#endif // VIM_BROWSE_PATCH
 }
 
 void
@@ -1321,12 +1107,8 @@ tfulldirt(void)
 void
 tcursor(int mode)
 {
-	#if VIM_BROWSE_PATCH
-	int alt = (histOp) ? 0 : (IS_SET(MODE_ALTSCREEN) + 1);
-	#else
 	static TCursor c[2];
 	int alt = IS_SET(MODE_ALTSCREEN);
-	#endif // VIM_BROWSE_PATCH
 
 	if (mode == CURSOR_SAVE) {
 		c[alt] = term.c;
@@ -1362,7 +1144,7 @@ treset(void)
 	for (i = 0; i < 2; i++) {
 		tmoveto(0, 0);
 		tcursor(CURSOR_SAVE);
-		#if COLUMNS_PATCH && !VIM_BROWSE_PATCH
+		#if COLUMNS_PATCH
 		tclearregion(0, 0, term.maxcol-1, term.row-1);
 		#else
 		tclearregion(0, 0, term.col-1, term.row-1);
@@ -1407,10 +1189,6 @@ tscrolldown(int orig, int n)
 	restoremousecursor();
 	#endif //OPENURLONCLICK_PATCH
 
-	#if VIM_BROWSE_PATCH
-	if (!orig && historyBufferScroll(-n))
-		return;
-	#endif // VIM_BROWSE_PATCH
 	int i;
 	Line temp;
 	#if SIXEL_PATCH
@@ -1427,7 +1205,7 @@ tscrolldown(int orig, int n)
 	LIMIT(n, 0, term.bot-orig+1);
 
 	tsetdirt(orig, term.bot-n);
-	#if COLUMNS_PATCH && !VIM_BROWSE_PATCH
+	#if COLUMNS_PATCH
 	tclearregion(0, term.bot-n+1, term.maxcol-1, term.bot);
 	#else
 	tclearregion(0, term.bot-n+1, term.col-1, term.bot);
@@ -1470,10 +1248,6 @@ tscrollup(int orig, int n)
 	restoremousecursor();
 	#endif //OPENURLONCLICK_PATCH
 
-	#if VIM_BROWSE_PATCH
-	if (!orig && historyBufferScroll(n))
-		return;
-	#endif // VIM_BROWSE_PATCH
 	int i;
 	Line temp;
 	#if SIXEL_PATCH
@@ -1504,7 +1278,7 @@ tscrollup(int orig, int n)
 	}
 	#endif // SCROLLBACK_PATCH
 
-	#if COLUMNS_PATCH && !VIM_BROWSE_PATCH
+	#if COLUMNS_PATCH
 	tclearregion(0, orig, term.maxcol-1, orig+n-1);
 	#else
 	tclearregion(0, orig, term.col-1, orig+n-1);
@@ -1738,16 +1512,13 @@ tclearregion(int x1, int y1, int x2, int y2)
 	if (y1 > y2)
 		temp = y1, y1 = y2, y2 = temp;
 
-	#if VIM_BROWSE_PATCH
-	LIMIT(x1, 0, buffCols-1);
-	LIMIT(x2, 0, buffCols-1);
-	#elif COLUMNS_PATCH
+	#if COLUMNS_PATCH
 	LIMIT(x1, 0, term.maxcol-1);
 	LIMIT(x2, 0, term.maxcol-1);
 	#else
 	LIMIT(x1, 0, term.col-1);
 	LIMIT(x2, 0, term.col-1);
-	#endif // VIM_BROWSE_PATCH
+	#endif // COLUMNS_PATCH
 	LIMIT(y1, 0, term.row-1);
 	LIMIT(y2, 0, term.row-1);
 
@@ -2128,7 +1899,7 @@ tsetmode(int priv, int set, const int *args, int narg)
 					break;
 				alt = IS_SET(MODE_ALTSCREEN);
 				if (alt) {
-					#if COLUMNS_PATCH && !VIM_BROWSE_PATCH
+					#if COLUMNS_PATCH
 					tclearregion(0, 0, term.maxcol-1, term.row-1);
 					#else
 					tclearregion(0, 0, term.col-1, term.row-1);
@@ -2204,7 +1975,7 @@ csihandle(void)
 	ImageList *im, *next;
 	int n, pi, pa;
 	#endif // SIXEL_PATCH
-	#if COLUMNS_PATCH && !VIM_BROWSE_PATCH
+	#if COLUMNS_PATCH
 	int maxcol = term.maxcol;
 	#else
 	int maxcol = term.col;
@@ -2318,7 +2089,7 @@ csihandle(void)
 			tclearregion(0, term.c.y, term.c.x, term.c.y);
 			break;
 		case 2: /* screen */
-			#if SCROLLBACK_PATCH || VIM_BROWSE_PATCH
+			#if SCROLLBACK_PATCH
 			if (!IS_SET(MODE_ALTSCREEN)) {
 				#if SCROLLBACK_PATCH
 				kscrolldown(&((Arg){ .i = term.scr }));
@@ -2349,19 +2120,7 @@ csihandle(void)
 			#endif // SIXEL_PATCH
 			break;
 		case 3: /* scrollback */
-			#if VIM_BROWSE_PATCH
-			if (!IS_SET(MODE_ALTSCREEN)) {
-				Glyph g=(Glyph){.bg=term.c.attr.bg, .fg=term.c.attr.fg, .u=' ', .mode=0};
-				for (int i = 0; i < buffSize; ++i) {
-					if (!BETWEEN(i, insertOff, insertOff + term.row - 1) &&
-							!(insertOff + term.row > buffSize &&
-							 BETWEEN(i, 0, (insertOff + term.row - 1) % buffSize))) {
-						for (int j = 0; j < term.col; ++j)
-							buf[i][j] = g;
-					}
-				}
-			}
-			#elif SCROLLBACK_PATCH
+			#if SCROLLBACK_PATCH
 			if (!IS_SET(MODE_ALTSCREEN)) {
 				term.scr = 0;
 				term.histi = 0;
@@ -3453,10 +3212,9 @@ check_control_code:
 		 */
 		return;
 	}
-	#if !VIM_BROWSE_PATCH
+
 	if (selected(term.c.x, term.c.y))
 		selclear();
-	#endif // VIM_BROWSE_PATCH
 
 	gp = &term.line[term.c.y][term.c.x];
 	if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
@@ -3550,221 +3308,6 @@ twrite(const char *buf, int buflen, int show_ctrl)
 	return n;
 }
 
-#if VIM_BROWSE_PATCH
-void
-tresize(int col, int row)
-{
-	int i;
-	#if SCROLLBACK_PATCH
-	int j;
-	#endif // SCROLLBACK_PATCH
-	#if VIM_BROWSE_PATCH
-	int const colSet = col, alt = IS_SET(MODE_ALTSCREEN), ini = buf == NULL;
-	col = MAX(col, buffCols);
-	row = MIN(row, buffSize);
-	int const minrow = MIN(row, term.row), mincol = MIN(col, buffCols);
-	#elif COLUMNS_PATCH
-	int tmp = col;
-	int minrow, mincol;
-
-	if (!term.maxcol)
-		term.maxcol = term.col;
-	col = MAX(col, term.maxcol);
-	minrow = MIN(row, term.row);
-	mincol = MIN(col, term.maxcol);
-	#else
-	int minrow = MIN(row, term.row);
-	int mincol = MIN(col, term.col);
-	#endif // VIM_BROWSE_PATCH
-	int *bp;
-	TCursor c;
-	#if SIXEL_PATCH
-	int x, x2;
-	Line line;
-	ImageList *im, *next;
-	#endif // SIXEL_PATCH
-
-	#if KEYBOARDSELECT_PATCH
-	if ( row < term.row  || col < term.col )
-		toggle_winmode(trt_kbdselect(XK_Escape, NULL, 0));
-	#endif // KEYBOARDSELECT_PATCH
-
-	if (col < 1 || row < 1) {
-		fprintf(stderr,
-		        "tresize: error resizing to %dx%d\n", col, row);
-		return;
-	}
-
-	#if VIM_BROWSE_PATCH
-	if (alt)
-		tswapscreen();
-	#endif // VIM_BROWSE_PATCH
-
-	/*
-	 * slide screen to keep cursor where we expect it -
-	 * tscrollup would work here, but we can optimize to
-	 * memmove because we're freeing the earlier lines
-	 */
-	for (i = 0; i <= term.c.y - row; i++) {
-		#if !VIM_BROWSE_PATCH
-		free(term.line[i]);
-		#endif // VIM_BROWSE_PATCH
-		free(term.alt[i]);
-	}
-	/* ensure that both src and dst are not NULL */
-	if (i > 0) {
-		#if !VIM_BROWSE_PATCH
-		memmove(term.line, term.line + i, row * sizeof(Line));
-		#endif // VIM_BROWSE_PATCH
-		memmove(term.alt, term.alt + i, row * sizeof(Line));
-	}
-	for (i += row; i < term.row; i++) {
-		#if !VIM_BROWSE_PATCH
-		free(term.line[i]);
-		#endif // VIM_BROWSE_PATCH
-		free(term.alt[i]);
-	}
-
-	/* resize to new height */
-	#if VIM_BROWSE_PATCH
-	buf = xrealloc(buf, (buffSize + row) * sizeof(Line));
-	mark = xrealloc(mark, col * row * sizeof(*mark));
-	#else
-	term.line = xrealloc(term.line, row * sizeof(Line));
-	#endif // VIM_BROWSE_PATCH
-	term.alt  = xrealloc(term.alt,  row * sizeof(Line));
-	term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
-	term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
-
-	#if SCROLLBACK_PATCH
-	Glyph gc=(Glyph){.bg=term.c.attr.bg, .fg=term.c.attr.fg, .u=' ', .mode=0};
-	for (i = 0; i < HISTSIZE; i++) {
-		term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph));
-		for (j = mincol; j < col; j++)
-			term.hist[i][j] = gc;
-	}
-	#endif // SCROLLBACK_PATCH
-
-	/* resize each row to new width, zero-pad if needed */
-	for (i = 0; i < minrow; i++) {
-		#if !VIM_BROWSE_PATCH
-		term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
-		#endif // VIM_BROWSE_PATCH
-		term.alt[i]  = xrealloc(term.alt[i],  col * sizeof(Glyph));
-	}
-
-	/* allocate any new rows */
-	for (/* i = minrow */; i < row; i++) {
-		#if !VIM_BROWSE_PATCH
-		term.line[i] = xmalloc(col * sizeof(Glyph));
-		#endif // VIM_BROWSE_PATCH
-		term.alt[i] = xmalloc(col * sizeof(Glyph));
-	}
-	#if VIM_BROWSE_PATCH
-	if (col > buffCols)
-	#elif COLUMNS_PATCH
-	if (col > term.maxcol)
-	#else
-	if (col > term.col)
-	#endif // VIM_BROWSE_PATCH
-	{
-		#if VIM_BROWSE_PATCH
-		bp = term.tabs + buffCols;
-		memset(bp, 0, sizeof(*term.tabs) * (col - buffCols));
-		#elif COLUMNS_PATCH
-		bp = term.tabs + term.maxcol;
-		memset(bp, 0, sizeof(*term.tabs) * (col - term.maxcol));
-		#else
-		bp = term.tabs + term.col;
-		memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
-		#endif // VIM_BROWSE_PATCH
-
-		while (--bp > term.tabs && !*bp)
-			/* nothing */ ;
-		for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
-			*bp = 1;
-	}
-	#if VIM_BROWSE_PATCH
-	Glyph g=(Glyph){.bg=term.c.attr.bg, .fg=term.c.attr.fg, .u=' ', .mode=0};
-	for (i = 0; i < buffSize; ++i) {
-		buf[i] = xrealloc(ini ? NULL : buf[i], col*sizeof(Glyph));
-		for (int j = ini ? 0 : buffCols; j < col; ++j) buf[i][j] = g;
-	}
-	for (i = 0; i < row; ++i) buf[buffSize + i] = buf[i];
-	term.line = &buf[*(histOp?&histOff:&insertOff) +=MAX(term.c.y-row+1,0)];
-	memset(mark, 0, col * row * sizeof(*mark));
-	#endif // VIM_BROWSE_PATCH
-	/* update terminal size */
-	#if VIM_BROWSE_PATCH
-	term.col = colSet;
-	buffCols = col;
-	#elif COLUMNS_PATCH
-	term.col = tmp;
-	term.maxcol = col;
-	#else
-	term.col = col;
-	#endif // VIM_BROWSE_PATCH
-	term.row = row;
-	#if VIM_BROWSE_PATCH
-	if (alt)
-		tswapscreen();
-	#endif // VIM_BROWSE_PATCH
-	/* reset scrolling region */
-	tsetscroll(0, row-1);
-	/* make use of the LIMIT in tmoveto */
-	tmoveto(term.c.x, term.c.y);
-	/* Clearing both screens (it makes dirty all lines) */
-	c = term.c;
-	for (i = 0; i < 2; i++) {
-		if (mincol < col && 0 < minrow) {
-			tclearregion(mincol, 0, col - 1, minrow - 1);
-		}
-		if (0 < col && minrow < row) {
-			tclearregion(0, minrow, col - 1, row - 1);
-		}
-		tswapscreen();
-		tcursor(CURSOR_LOAD);
-	}
-	term.c = c;
-
-	#if SIXEL_PATCH
-	/* expand images into new text cells to prevent them from being deleted in
-	 * xfinishdraw() that draws the images */
-	for (i = 0; i < 2; i++) {
-		for (im = term.images; im; im = next) {
-			next = im->next;
-			#if SCROLLBACK_PATCH
-			if (IS_SET(MODE_ALTSCREEN)) {
-				if (im->y < 0 || im->y >= term.row) {
-					delete_image(im);
-					continue;
-				}
-				line = term.line[im->y];
-			} else {
-				if (im->y - term.scr < -HISTSIZE || im->y - term.scr >= term.row) {
-					delete_image(im);
-					continue;
-				}
-				line = TLINE(im->y);
-			}
-			#else
-			if (im->y < 0 || im->y >= term.row) {
-				delete_image(im);
-				continue;
-			}
-			line = term.line[im->y];
-			#endif // SCROLLBACK_PATCH
-			x2 = MIN(im->x + im->cols, term.col);
-			for (x = im->x; x < x2; x++) {
-				line[x].u = ' ';
-				line[x].mode = ATTR_SIXEL;
-			}
-		}
-		tswapscreen();
-	}
-	#endif // SIXEL_PATCH
-}
-#else // !VIM_BROWSE_PATCH
 void
 tresize(int col, int row)
 {
@@ -3800,11 +3343,6 @@ tresize(int col, int row)
 		return;
 	}
 
-	#if VIM_BROWSE_PATCH
-	if (alt)
-		tswapscreen();
-	#endif // VIM_BROWSE_PATCH
-
 	/* scroll both screens independently */
 	if (row < term.row) {
 		tcursor(CURSOR_SAVE);
@@ -3932,7 +3470,6 @@ tresize(int col, int row)
 	}
 	#endif // SIXEL_PATCH
 }
-#endif // VIM_BROWSE_PATCH
 
 void
 resettitle(void)
@@ -3947,19 +3484,9 @@ resettitle(void)
 void
 drawregion(int x1, int y1, int x2, int y2)
 {
-	#if VIM_BROWSE_PATCH
-	if (altToggle && histMode && !histOp)
-		memset(term.dirty, 0, sizeof(*term.dirty) * term.row);
-	int const o = !IS_SET(MODE_ALTSCREEN) && histMode && !histOp, h =rows();
-	#endif // VIM_BROWSE_PATCH
 	int y;
 
 	for (y = y1; y < y2; y++) {
-		#if VIM_BROWSE_PATCH
-		int const oy = o ? (y + insertOff - histOff + h) % h : y;
-		if (!BETWEEN(oy, 0, term.row-1) || !term.dirty[y]) continue;
-		xdrawline(term.line[y], x1, oy, x2);
-		#else
 		if (!term.dirty[y])
 			continue;
 
@@ -3969,11 +3496,7 @@ drawregion(int x1, int y1, int x2, int y2)
 		#else
 		xdrawline(term.line[y], x1, y, x2);
 		#endif // SCROLLBACK_PATCH
-		#endif // VIM_BROWSE_PATCH
 	}
-	#if VIM_BROWSE_PATCH
-	memset(&term.dirty[y1], 0, sizeof(*term.dirty) * (y2 - y1));
-	#endif // VIM_BROWSE_PATCH
 }
 
 #include "patch/st_include.c"
@@ -3994,16 +3517,9 @@ draw(void)
 	if (term.line[term.c.y][cx].mode & ATTR_WDUMMY)
 		cx--;
 
-	#if VIM_BROWSE_PATCH
-	if (histMode)
-		historyPreDraw();
-	#endif // VIM_BROWSE_PATCH
-
 	drawregion(0, 0, term.col, term.row);
 
-	#if VIM_BROWSE_PATCH
-	if (!histMode)
-	#elif SCROLLBACK_PATCH
+	#if SCROLLBACK_PATCH
 	if (term.scr == 0)
 	#endif // SCROLLBACK_PATCH
 	#if LIGATURES_PATCH
diff --git a/st.h b/st.h
index 8d8ffa9..110f4aa 100644
--- a/st.h
+++ b/st.h
@@ -16,9 +16,6 @@
 #define MAX(a, b)		((a) < (b) ? (b) : (a))
 #define LEN(a)			(sizeof(a) / sizeof(a)[0])
 #define BETWEEN(x, a, b)	((a) <= (x) && (x) <= (b))
-#if VIM_BROWSE_PATCH
-#define OUT(x, a, b)		((a) <= (x) || (x) <= (b))
-#endif // VIM_BROWSE_PATCH
 #define DIVCEIL(n, d)		(((n) + ((d) - 1)) / (d))
 #define DEFAULT(a, b)		(a) = (a) ? (a) : (b)
 #define LIMIT(x, a, b)		(x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
@@ -164,7 +161,7 @@ typedef struct {
 typedef struct {
 	int row;      /* nb row */
 	int col;      /* nb col */
-	#if COLUMNS_PATCH && !VIM_BROWSE_PATCH
+	#if COLUMNS_PATCH
 	int maxcol;
 	#endif // COLUMNS_PATCH
 	Line *line;   /* screen */
@@ -341,9 +338,6 @@ int tattrset(int);
 int tisaltscr(void);
 void tnew(int, int);
 void tresize(int, int);
-#if VIM_BROWSE_PATCH
-void tmoveto(int x, int y);
-#endif // VIM_BROWSE_PATCH
 void tsetdirtattr(int);
 void ttyhangup(void);
 int ttynew(const char *, char *, const char *, char **);
diff --git a/win.h b/win.h
index 55bd990..709e4e1 100644
--- a/win.h
+++ b/win.h
@@ -21,9 +21,7 @@ enum win_mode {
 	MODE_NUMLOCK     = 1 << 17,
 	MODE_MOUSE       = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
 	                  |MODE_MOUSEMANY,
-	#if VIM_BROWSE_PATCH
-	MODE_NORMAL      = 1 << 18,
-	#endif // VIM_BROWSE_PATCH
+	MODE_PLACEHOLDER = 1 << 18,
 	#if KEYBOARDSELECT_PATCH
 	MODE_KBDSELECT   = 1 << 19,
 	#endif // KEYBOARDSELECT_PATCH
diff --git a/x.c b/x.c
index a92918c..17c466a 100644
--- a/x.c
+++ b/x.c
@@ -486,9 +486,7 @@ bpress(XEvent *e)
 {
 	int btn = e->xbutton.button;
 	struct timespec now;
-	#if !VIM_BROWSE_PATCH
 	int snap;
-	#endif // VIM_BROWSE_PATCH
 
 	if (1 <= btn && btn <= 11)
 		buttons |= 1 << (btn-1);
@@ -507,34 +505,6 @@ bpress(XEvent *e)
 		 * snapping behaviour is exposed.
 		 */
 		clock_gettime(CLOCK_MONOTONIC, &now);
-		#if VIM_BROWSE_PATCH
-		int const tripleClick = TIMEDIFF(now, xsel.tclick2) <= tripleclicktimeout,
-		doubleClick = TIMEDIFF(now, xsel.tclick1) <= doubleclicktimeout;
-		if ((mouseYank || mouseSelect) && (tripleClick || doubleClick)) {
-			if (!IS_SET(MODE_NORMAL)) normalMode();
-			historyOpToggle(1, 1);
-			tmoveto(evcol(e), evrow(e));
-			if (tripleClick) {
-				if (mouseYank) pressKeys("dVy", 3);
-				if (mouseSelect) pressKeys("dV", 2);
-			} else if (doubleClick) {
-				if (mouseYank) pressKeys("dyiW", 4);
-				if (mouseSelect) {
-					tmoveto(evcol(e), evrow(e));
-					pressKeys("viW", 3);
-				}
-			}
-			historyOpToggle(-1, 1);
-		} else {
-			if (!IS_SET(MODE_NORMAL)) selstart(evcol(e), evrow(e), 0);
-			else {
-				historyOpToggle(1, 1);
-				tmoveto(evcol(e), evrow(e));
-				pressKeys("v", 1);
-				historyOpToggle(-1, 1);
-			}
-		}
-		#else
 		if (TIMEDIFF(now, xsel.tclick2) <= tripleclicktimeout) {
 			snap = SNAP_LINE;
 		} else if (TIMEDIFF(now, xsel.tclick1) <= doubleclicktimeout) {
@@ -542,13 +512,10 @@ bpress(XEvent *e)
 		} else {
 			snap = 0;
 		}
-		#endif // VIM_BROWSE_PATCH
 		xsel.tclick2 = xsel.tclick1;
 		xsel.tclick1 = now;
 
-		#if !VIM_BROWSE_PATCH
 		selstart(evcol(e), evrow(e), snap);
-		#endif // VIM_BROWSE_PATCH
 
 		#if OPENURLONCLICK_PATCH
 		clearurl();
@@ -800,15 +767,7 @@ brelease(XEvent *e)
 
 	if (mouseaction(e, 1))
 		return;
-	#if VIM_BROWSE_PATCH
-	if (btn == Button1 && !IS_SET(MODE_NORMAL)) {
-		mousesel(e, 1);
-		#if OPENURLONCLICK_PATCH
-		if (url_click && e->xkey.state & url_opener_modkey)
-			openUrlOnClick(evcol(e), evrow(e), url_opener);
-		#endif // OPENURLONCLICK_PATCH
-	}
-	#else
+
 	if (btn == Button1) {
 		mousesel(e, 1);
 		#if OPENURLONCLICK_PATCH
@@ -816,7 +775,7 @@ brelease(XEvent *e)
 			openUrlOnClick(evcol(e), evrow(e), url_opener);
 		#endif // OPENURLONCLICK_PATCH
 	}
-	#endif // VIM_BROWSE_PATCH
+
 	#if RIGHTCLICKTOPLUMB_PATCH
 	else if (btn == Button3)
 		plumb(xsel.primary);
@@ -842,9 +801,6 @@ bmotion(XEvent *e)
 	}
 	#endif // HIDECURSOR_PATCH
 	#if OPENURLONCLICK_PATCH
-	#if VIM_BROWSE_PATCH
-	if (!IS_SET(MODE_NORMAL))
-	#endif // VIM_BROWSE_PATCH
 	if (!IS_SET(MODE_MOUSE)) {
 		if (!(e->xbutton.state & Button1Mask) && detecturl(evcol(e), evrow(e), 1))
 			XDefineCursor(xw.dpy, xw.win, xw.upointer);
@@ -945,17 +901,6 @@ xloadcolor(int i, const char *name, Color *ncolor)
 	return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
 }
 
-#if VIM_BROWSE_PATCH
-void normalMode()
-{
-	#if OPENURLONCLICK_PATCH
-	clearurl();
-	restoremousecursor();
-	#endif // OPENURLONCLICK_PATCH
-	historyModeToggle((win.mode ^=MODE_NORMAL) & MODE_NORMAL);
-}
-#endif // VIM_BROWSE_PATCH
-
 #if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH
 void
 xloadalpha(void)
@@ -1701,17 +1646,12 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
 	#endif // LIGATURES_PATCH | VERTCENTER_PATCH
 	{
 		/* Fetch rune and mode for current glyph. */
-		#if VIM_BROWSE_PATCH
-		Glyph g = glyphs[i];
-		historyOverlay(x+i, y, &g);
-		rune = g.u;
-		mode = g.mode;
-		#elif LIGATURES_PATCH
+		#if LIGATURES_PATCH
 		int idx = shaped.glyphs[code_idx].cluster;
 		#else
 		rune = glyphs[i].u;
 		mode = glyphs[i].mode;
-		#endif // VIM_BROWSE_PATCH | LIGATURES_PATCH
+		#endif // LIGATURES_PATCH
 
 		/* Skip dummy wide-character spacing. */
 		#if LIGATURES_PATCH
@@ -3020,9 +2960,6 @@ xdrawline(Line line, int x1, int y1, int x2)
 		i = ox = 0;
 		for (x = x1; x < x2 && i < numspecs; x++) {
 			new = line[x];
-			#if VIM_BROWSE_PATCH
-			historyOverlay(x, y1, &new);
-			#endif // VIM_BROWSE_PATCH
 			if (new.mode == ATTR_WDUMMY)
 				continue;
 			if (selected(x, y1))
@@ -3060,9 +2997,6 @@ xdrawline(Line line, int x1, int y1, int x2)
 	i = ox = 0;
 	for (x = x1; x < x2 && i < numspecs; x++) {
 		new = line[x];
-		#if VIM_BROWSE_PATCH
-		historyOverlay(x, y1, &new);
-		#endif // VIM_BROWSE_PATCH
 		if (new.mode == ATTR_WDUMMY)
 			continue;
 		if (selected(x, y1))
@@ -3489,13 +3423,6 @@ kpress(XEvent *ev)
 		return;
 	}
 	#endif // KEYBOARDSELECT_PATCH
-	#if VIM_BROWSE_PATCH
-	if (IS_SET(MODE_NORMAL)) {
-		if (kPressHist(buf, len, match(ControlMask, e->state), &ksym)
-		                                      == finish) normalMode();
-		return;
-	}
-	#endif // VIM_BROWSE_PATCH
 
 	screen = tisaltscr() ? S_ALT : S_PRI;