summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <mvath@google.com>2019-02-17 11:17:32 +0100
committerMartin Väth <mvath@google.com>2019-02-17 11:21:48 +0100
commit3acf205a14349d39ae0ce9b179fe60d2b684547a (patch)
tree73dda6db8cfe55e768fa6ff9b5c4bea79c04d2ba /sys-apps/less/files
parentmedia-tv/sundtek-tv: Make pulseaudio optional (diff)
downloadmv-3acf205a14349d39ae0ce9b179fe60d2b684547a.tar.gz
mv-3acf205a14349d39ae0ce9b179fe60d2b684547a.tar.bz2
mv-3acf205a14349d39ae0ce9b179fe60d2b684547a.zip
sys-apps/less: Version bump
Signed-off-by: Martin Väth <mvath@google.com>
Diffstat (limited to 'sys-apps/less/files')
-rw-r--r--sys-apps/less/files/less-549-mouse_fix.patch51
-rw-r--r--sys-apps/less/files/lesspipe.sh2
2 files changed, 52 insertions, 1 deletions
diff --git a/sys-apps/less/files/less-549-mouse_fix.patch b/sys-apps/less/files/less-549-mouse_fix.patch
new file mode 100644
index 00000000..495073a3
--- /dev/null
+++ b/sys-apps/less/files/less-549-mouse_fix.patch
@@ -0,0 +1,51 @@
+From d5015d29f79e70fb70489616c0f2d0ff32e52898 Mon Sep 17 00:00:00 2001
+From: Mark Nudelman <markn@greenwoodsoftware.com>
+Date: Sat, 16 Feb 2019 07:20:42 -0800
+Subject: [PATCH] Don't emit mouse controls if --mouse is not set.
+
+---
+ screen.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/screen.c b/screen.c
+index 9a32685..b58fe26 100644
+--- a/screen.c
++++ b/screen.c
+@@ -1549,6 +1549,8 @@ win32_deinit_term(VOID_PARAM)
+ public void
+ init_mouse(VOID_PARAM)
+ {
++ if (!mousecap)
++ return;
+ #if !MSDOS_COMPILER
+ tputs(sc_s_mousecap, sc_height, putchr);
+ #else
+@@ -1565,6 +1567,8 @@ init_mouse(VOID_PARAM)
+ public void
+ deinit_mouse(VOID_PARAM)
+ {
++ if (!mousecap)
++ return;
+ #if !MSDOS_COMPILER
+ tputs(sc_e_mousecap, sc_height, putchr);
+ #else
+@@ -1587,8 +1591,7 @@ init(VOID_PARAM)
+ tputs(sc_init, sc_height, putchr);
+ if (!no_keypad)
+ tputs(sc_s_keypad, sc_height, putchr);
+- if (mousecap)
+- init_mouse();
++ init_mouse();
+ }
+ if (top_scroll)
+ {
+@@ -1626,8 +1629,7 @@ deinit(VOID_PARAM)
+ #if !MSDOS_COMPILER
+ if (!(quit_if_one_screen && one_screen))
+ {
+- if (mousecap)
+- deinit_mouse();
++ deinit_mouse();
+ if (!no_keypad)
+ tputs(sc_e_keypad, sc_height, putchr);
+ if (!no_init)
diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh
index 56cef730..66078850 100644
--- a/sys-apps/less/files/lesspipe.sh
+++ b/sys-apps/less/files/lesspipe.sh
@@ -246,7 +246,7 @@ if [[ -z $1 ]] ; then
elif [[ $1 == "-V" || $1 == "--version" ]] ; then
cat <<-EOF
lesspipe (git)
- Copyright 2001-2016 Gentoo Authors
+ Copyright 2001-2016 Gentoo Foundation
Mike Frysinger <vapier@gentoo.org>
(with plenty of ideas stolen from other projects/distros)