Vendor import of less v581.2.vendor/less/v581.2

1 files changed, 8 insertions, 8 deletions

diff --git a/screen.c b/screen.c
index 7e8f8af4f463..ff6b6d785af7 100644
--- a/screen.c
+++ b/screen.c
@@ -1673,8 +1673,6 @@ ltputs(str, affcnt, f_putc)
 	public void
 init_mouse(VOID_PARAM)
 {
-	if (!mousecap)
-		return;
 #if !MSDOS_COMPILER
 	ltputs(sc_s_mousecap, sc_height, putchr);
 #else
@@ -1693,8 +1691,6 @@ init_mouse(VOID_PARAM)
 	public void
 deinit_mouse(VOID_PARAM)
 {
-	if (!mousecap)
-		return;
 #if !MSDOS_COMPILER
 	ltputs(sc_e_mousecap, sc_height, putchr);
 #else
@@ -1718,7 +1714,8 @@ init(VOID_PARAM)
 			ltputs(sc_init, sc_height, putchr);
 		if (!no_keypad)
 			ltputs(sc_s_keypad, sc_height, putchr);
-		init_mouse();
+		if (mousecap)
+			init_mouse();
 	}
 	init_done = 1;
 	if (top_scroll) 
@@ -1741,7 +1738,8 @@ init(VOID_PARAM)
 	{
 		if (!no_init)
 			win32_init_term();
-		init_mouse();
+		if (mousecap)
+			init_mouse();
 
 	}
 	win32_init_vt_term();
@@ -1763,7 +1761,8 @@ deinit(VOID_PARAM)
 #if !MSDOS_COMPILER
 	if (!(quit_if_one_screen && one_screen))
 	{
-		deinit_mouse();
+		if (mousecap)
+			deinit_mouse();
 		if (!no_keypad)
 			ltputs(sc_e_keypad, sc_height, putchr);
 		if (!no_init)
@@ -1776,7 +1775,8 @@ deinit(VOID_PARAM)
 	win32_deinit_vt_term();
 	if (!(quit_if_one_screen && one_screen))
 	{
-		deinit_mouse();
+		if (mousecap)
+			deinit_mouse();
 		if (!no_init)
 			win32_deinit_term();
 	}