diff options
Diffstat (limited to 'app-misc/mc')
| -rw-r--r-- | app-misc/mc/ChangeLog | 8 | ||||
| -rw-r--r-- | app-misc/mc/files/mc-4.8.5-Ticket-2881-fix-tabs.patch | 39 | ||||
| -rw-r--r-- | app-misc/mc/mc-4.8.6.ebuild (renamed from app-misc/mc/mc-4.8.5-r1.ebuild) | 4 |
3 files changed, 8 insertions, 43 deletions
diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog index 4920e00c0fa4..7d0dfc45a854 100644 --- a/app-misc/mc/ChangeLog +++ b/app-misc/mc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-misc/mc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.266 2012/09/14 05:12:42 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.267 2012/09/15 07:33:26 slyfox Exp $ + +*mc-4.8.6 (15 Sep 2012) + + 15 Sep 2012; Sergei Trofimovich <slyfox@gentoo.org> +mc-4.8.6.ebuild, + -files/mc-4.8.5-Ticket-2881-fix-tabs.patch, -mc-4.8.5-r1.ebuild: + Fast upstream version bump (fixes two critical bugs in previous version). *mc-4.8.5-r1 (14 Sep 2012) diff --git a/app-misc/mc/files/mc-4.8.5-Ticket-2881-fix-tabs.patch b/app-misc/mc/files/mc-4.8.5-Ticket-2881-fix-tabs.patch deleted file mode 100644 index ca4a6cbf64d0..000000000000 --- a/app-misc/mc/files/mc-4.8.5-Ticket-2881-fix-tabs.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://www.midnight-commander.org/ticket/2881 -https://bugs.gentoo.org/show_bug.cgi?id=434688 - -commit 28cd54da5a73e6d722bd0534e3f43baedb398cea -Author: Andrew Borodin <aborodin@vmail.ru> -Date: Tue Sep 11 10:14:48 2012 +0400 - - Ticket #2881: (edit_move_forward3): fix two-columns extra offset of cursor - - ...after tab character. - - Signed-off-by: Andrew Borodin <aborodin@vmail.ru> - -diff --git a/src/editor/edit.c b/src/editor/edit.c -index bfda1b9..3dfd22e 100644 ---- a/src/editor/edit.c -+++ b/src/editor/edit.c -@@ -3073,16 +3073,15 @@ edit_move_forward3 (WEdit * edit, off_t current, long cols, off_t upto) - c = convert_to_display_c (c); - #endif - -+ if (c == '\n') -+ return (upto != 0 ? (off_t) col : p); - if (c == '\t') - col += TAB_SIZE - col % TAB_SIZE; -- else if (c == '\n') -- return (upto != 0 ? (off_t) col : p); -- -- if ((c < 32 || c == 127) && (orig_c == c -+ else if ((c < 32 || c == 127) && (orig_c == c - #ifdef HAVE_CHARSET -- || (!mc_global.utf8_display && !edit->utf8) -+ || (!mc_global.utf8_display && !edit->utf8) - #endif -- )) -+ )) - /* '\r' is shown as ^M, so we must advance 2 characters */ - /* Caret notation for control characters */ - col += 2; diff --git a/app-misc/mc/mc-4.8.5-r1.ebuild b/app-misc/mc/mc-4.8.6.ebuild index 4ce6df9e82e0..37a454268b92 100644 --- a/app-misc/mc/mc-4.8.5-r1.ebuild +++ b/app-misc/mc/mc-4.8.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.5-r1.ebuild,v 1.1 2012/09/14 05:12:42 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.6.ebuild,v 1.1 2012/09/15 07:33:26 slyfox Exp $ EAPI=4 @@ -43,8 +43,6 @@ DEPEND="${RDEPEND} src_prepare() { [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh - - epatch "${FILESDIR}"/${P}-Ticket-2881-fix-tabs.patch } S=${WORKDIR}/${MY_P} |