rpms/less/devel less-382-fixline.patch,1.1,1.2 less.spec,1.25,1.26

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/less/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20275

Modified Files:
	less-382-fixline.patch less.spec 
Log Message:
* Mon Jan 16 2005 Jindrich Novy <jnovy at redhat.com> 394-2
- apply better fix for #120916 from Avi Kivity (#177819)
  to avoid flickering when '>' is pressed multiple times


less-382-fixline.patch:
 jump.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Index: less-382-fixline.patch
===================================================================
RCS file: /cvs/dist/rpms/less/devel/less-382-fixline.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- less-382-fixline.patch	6 Sep 2005 10:10:07 -0000	1.1
+++ less-382-fixline.patch	16 Jan 2006 14:20:52 -0000	1.2
@@ -1,10 +1,28 @@
---- less-382/command.c.fixline	2004-02-04 05:52:26.000000000 +0100
-+++ less-382/command.c	2005-09-05 09:24:03.000000000 +0200
-@@ -1168,6 +1168,7 @@
- 				jump_forw();
- 			else
- 				jump_back(number);
+--- less-394/jump.c.fixline	2005-12-03 21:20:32.000000000 +0100
++++ less-394/jump.c	2006-01-16 15:12:00.000000000 +0100
+@@ -30,7 +30,7 @@
+ 	public void
+ jump_forw()
+ {
+-	POSITION pos;
++	POSITION pos, end_pos;
+ 
+ 	if (ch_end_seek())
+ 	{
+@@ -42,11 +42,15 @@ jump_forw()
+ 	 * Go back one line from the end of the file
+ 	 * to get to the beginning of the last line.
+ 	 */
+-	pos = back_line(ch_tell());
++	pos = back_line(end_pos = ch_tell());
+ 	if (pos == NULL_POSITION)
+ 		jump_loc((POSITION)0, sc_height-1);
+ 	else
++	{
+ 		jump_loc(pos, sc_height-1);
++		if (position(sc_height-1) != end_pos)
 +			repaint();
- 			break;
++	}
+ }
  
- 		case A_GOPOS:
+ /*


Index: less.spec
===================================================================
RCS file: /cvs/dist/rpms/less/devel/less.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- less.spec	9 Dec 2005 22:41:15 -0000	1.25
+++ less.spec	16 Jan 2006 14:20:52 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: A text file browser similar to more, but better.
 Name: less
 Version: 394
-Release: 1.1
+Release: 2
 License: GPL
 Group: Applications/Text
 Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
@@ -54,6 +54,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jan 16 2005 Jindrich Novy <jnovy at redhat.com> 394-2
+- apply better fix for #120916 from Avi Kivity (#177819)
+  to avoid flickering when '>' is pressed multiple times
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt