Fix from upstream for minor bug in display not being updated properly.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 109 insertions, 7 deletions

diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog
index 4b9cb97c237c..172d6dbbecf8 100644
--- a/app-editors/nano/ChangeLog
+++ b/app-editors/nano/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/nano
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.77 2005/08/03 18:42:52 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.78 2005/09/14 02:15:14 vapier Exp $
+
+  14 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/nano-1.3.8-display.patch, nano-1.3.8.ebuild:
+  Fix from upstream for minor bug in display not being updated properly.
 
   03 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> nano-1.3.7.ebuild:
   Stable on alpha.
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index db21925b3f13..d0a63617342a 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -6,8 +6,8 @@ MD5 d19e09c84b8f8d58faf85ee043128995 nano-1.3.7.ebuild 1744
 MD5 b297797b490f7c6ca8d5f40f2d6347cc metadata.xml 1015
 MD5 6f760844d541acb2dd4c92e22edc5759 nano-1.3.6.ebuild 1755
 MD5 32ad8dd2260ac44dbbeb2d50e2ed0df6 nano-1.2.5.ebuild 1429
-MD5 58f3d2c588632339499b85c38628d8ac nano-1.3.8.ebuild 1808
-MD5 3bbdfed298bab8954dff2f617417236a ChangeLog 8419
+MD5 3c41d147a2a833f8c112d661fa64ae8a nano-1.3.8.ebuild 1849
+MD5 d142b6dcab6c1a202cd876e590fd8dad ChangeLog 8597
 MD5 959e0d50769b5362d326d0d26809ff02 files/digest-nano-1.3.7 63
 MD5 ebe8f2a4d216c558d080645929ad7176 files/nano-1.3.6-nomac.patch 883
 MD5 e96987d3e608193dd5a2c0c0122571b5 files/nanorc-gentoo 1864
@@ -17,13 +17,14 @@ MD5 a5c8733d0235f5a0958b395ad9f44611 files/digest-nano-1.3.8 63
 MD5 186cedbceeaf68b6146eda881e9db05a files/nano-1.3.8-rep.patch 305
 MD5 b6b8e30beb4e577ac5d8d58bced6b326 files/digest-nano-1.3.6 62
 MD5 95e2a2065a0c2ff580dcf645fba2de1e files/digest-nano-1.3.4 62
+MD5 7da73db140725a63af026111d6bbc4ff files/nano-1.3.8-display.patch 2328
 MD5 4cf6c77ed7c28d94c8de44d8318176c3 files/1.3.4-nomac.patch 511
 MD5 60ac26176596b3e131acc70a327fde01 files/nano-1.3.6-debug-typo.patch 415
 MD5 9ecacdb9e41a6ddb3200113238ca4b2b files/nanorc-sh 646
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDFi3ngIKl8Uu19MoRAuN4AJ9bOaS4Y01RFdAqGsnWJ6/BPwTa2gCfX0Ev
-o8Vje9oZ51PileaWi2VJeQo=
-=kaie
+iD8DBQFDJ4fGgIKl8Uu19MoRAmgvAJ4onuKqG7MZPeGEB0XyZ6ATqaOguwCffXZL
+xsIu20kUlwBqd83bXJPN+5w=
+=tUgx
 -----END PGP SIGNATURE-----
diff --git a/app-editors/nano/files/nano-1.3.8-display.patch b/app-editors/nano/files/nano-1.3.8-display.patch
new file mode 100644
index 000000000000..2f3aacdc0634
--- /dev/null
+++ b/app-editors/nano/files/nano-1.3.8-display.patch
@@ -0,0 +1,96 @@
+http://lists.gnu.org/archive/html/nano-devel/2005-09/msg00012.html
+
+--- nano-1.3.8/src/global.c
++++ nano-1.3.8/src/global.c
+@@ -528,11 +528,11 @@
+ 
+     sc_init_one(&main_list, NANO_FORWARD_KEY, N_("Forward"),
+ 	IFHELP(nano_forward_msg, NANO_NO_KEY), NANO_NO_KEY,
+-	NANO_NO_KEY, VIEW, do_right_void);
++	NANO_NO_KEY, VIEW, do_right);
+ 
+     sc_init_one(&main_list, NANO_BACK_KEY, N_("Back"),
+ 	IFHELP(nano_back_msg, NANO_NO_KEY), NANO_NO_KEY,
+-	NANO_NO_KEY, VIEW, do_left_void);
++	NANO_NO_KEY, VIEW, do_left);
+ 
+     sc_init_one(&main_list, NANO_HOME_KEY, N_("Home"),
+ 	IFHELP(nano_home_msg, NANO_NO_KEY), NANO_NO_KEY,
+--- nano-1.3.8/src/move.c
++++ nano-1.3.8/src/move.c
+@@ -248,7 +248,7 @@
+     update_line(current, current_x);
+ }
+ 
+-void do_left(bool allow_update)
++void do_left(void)
+ {
+     size_t pww_save = placewewant;
+     if (current_x > 0)
+@@ -259,16 +259,11 @@
+     }
+     placewewant = xplustabs();
+     check_statusblank();
+-    if (allow_update && need_horizontal_update(pww_save))
++    if (need_horizontal_update(pww_save))
+ 	update_line(current, current_x);
+ }
+ 
+-void do_left_void(void)
+-{
+-    do_left(TRUE);
+-}
+-
+-void do_right(bool allow_update)
++void do_right(void)
+ {
+     size_t pww_save = placewewant;
+     assert(current_x <= strlen(current->data));
+@@ -281,11 +276,6 @@
+     }
+     placewewant = xplustabs();
+     check_statusblank();
+-    if (allow_update && need_horizontal_update(pww_save))
++    if (need_horizontal_update(pww_save))
+ 	update_line(current, current_x);
+ }
+-
+-void do_right_void(void)
+-{
+-    do_right(TRUE);
+-}
+--- nano-1.3.8/src/nano.c
++++ nano-1.3.8/src/nano.c
+@@ -1304,7 +1304,7 @@
+ void do_backspace(void)
+ {
+     if (current != fileage || current_x > 0) {
+-	do_left(FALSE);
++	do_left();
+ 	do_delete();
+     }
+ }
+@@ -4093,7 +4093,7 @@
+ 	    mark_beginx += char_buf_len;
+ #endif
+ 
+-	do_right(FALSE);
++	do_right();
+ 
+ #ifndef DISABLE_WRAPPING
+ 	/* If we're wrapping text, we need to call edit_refresh(). */
+--- nano-1.3.8/src/proto.h
++++ nano-1.3.8/src/proto.h
+@@ -353,10 +353,8 @@
+ void do_page_down(void);
+ void do_up(void);
+ void do_down(void);
+-void do_left(bool allow_update);
+-void do_left_void(void);
+-void do_right(bool allow_update);
+-void do_right_void(void);
++void do_left(void);
++void do_right(void);
+ 
+ /* Public functions in nano.c. */
+ void print_view_warning(void);
diff --git a/app-editors/nano/nano-1.3.8.ebuild b/app-editors/nano/nano-1.3.8.ebuild
index bd36fd0e595a..dbf6b73d4484 100644
--- a/app-editors/nano/nano-1.3.8.ebuild
+++ b/app-editors/nano/nano-1.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.8.ebuild,v 1.3 2005/08/31 22:23:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.8.ebuild,v 1.4 2005/09/14 02:15:14 vapier Exp $
 
 inherit eutils
 
@@ -23,6 +23,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-rep.patch
+	epatch "${FILESDIR}"/${P}-display.patch
 	use nomac && epatch "${FILESDIR}"/${PN}-1.3.6-nomac.patch
 }