Fix tab effect bug in editor (bug #434688 by Lars Wendler).

Package-Manager: portage-2.2.0_alpha124_p5/cvs/Linux x86_64

4 files changed, 56 insertions, 7 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 4f4b76a2463c..4920e00c0fa4 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.265 2012/09/10 21:02:57 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.266 2012/09/14 05:12:42 slyfox Exp $
+
+*mc-4.8.5-r1 (14 Sep 2012)
+
+  14 Sep 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/mc-4.8.5-Ticket-2881-fix-tabs.patch, +mc-4.8.5-r1.ebuild,
+  -mc-4.8.5.ebuild:
+  Fix tab effect bug in editor (bug #434688 by Lars Wendler).
 
 *mc-4.8.5 (10 Sep 2012)
 
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index ad8ac519ba42..7552817de52a 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -12,6 +12,7 @@ AUX mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch 2409 SHA256 3a1b4e333f8cda
 AUX mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch 1790 SHA256 5df43bdc2d1063204ce52a80998b05bc82037d157a9b3ecc90f48e00c8d0b433 SHA512 59ff7c5969c4a4db6268944ec8bd34f96e17cbe9d140ccd52abbf4a54ac5b276e71a529a7624492d8709dd48805fe453646c5515fb31d0dd791ccd4fd8195092 WHIRLPOOL e7f694a2b260fdc8f05cd55fde2e363ad610467a3fc1020a30a455d230781ea32e0dd9e8466b9164408fcc5ba336f161df0e8ebe0025af6029a15b0ed68194eb
 AUX mc-4.8.4-Ticket-2856-aspell-sigsegv.patch 2867 SHA256 44cebc6d38ffb38c4c7108295bc3d7f49c8ef268d9d8028a3181fd76ab01a3d0 SHA512 df0d6c439004900ddb73079fb11e6e400bd5b317794f6bc5ffdc7f8216d89cf59dce1a76a248561dd1bb04034343d50c9b0376565c83aae2234ee456506cf755 WHIRLPOOL e39f1acb3d0b99e663a86a8b5e7dc35db96b66efeeac7b7ca12d22ee83037dd33cfd6545b6a8713b7f9251120801f40bf161e0a282a84af19f7d52d41b478b21
 AUX mc-4.8.4-Ticket-2858-htmlview-segfault.patch 1079 SHA256 ba7cce62af883504b82fc0489ea290b5a325d89d97a5c15d66f587ddefaf8ace SHA512 9f0bfb62d1783a2e3379245d43dfd22f82928fb188c79a0fbf1bd19c0a553b13b120b6c925db1cf70d3050148877a2ddd1d4540446b15a0b7e7c2134d752ab1d WHIRLPOOL c75dec958f43d7c6c5ebd9f08258bf7698f2afdd9af18e95b54aad8576dd1cfdfb8b803d6363ffe1345d3dd8d49f6533c0908fff4b6ec9602ac780ed80347c2e
+AUX mc-4.8.5-Ticket-2881-fix-tabs.patch 1392 SHA256 9a780605c5afd7741173e1c046fd25aad468b3e0a4f4ea492eaa457893d33800 SHA512 0cbf41d8a249faeba653d4ef4656b2a5b3fc81a63bbda07f160505fbbc33479da1ae534cd9a07acec3474146a85f2ee3aeb1965c81ff43b8a1e60eb9ef97aea7 WHIRLPOOL bf280a76ebe152087c5e44f247a5f31a91295491719102fa6a04de56b7f8e1e6af2ce589b5f62e597e76870e70f276c05974e92efea8e74917234690b7743834
 DIST mc-4.8.1.tar.xz 2057960 SHA256 3a734a12940e7f7db5b93a45823266c5ec2582838ac7d62c681283c1b0a8b672 SHA512 39158429c78e959700411e4b3c714552cad4e8badedcf9c391e4807f27f35753dcf911427b4319ea22be03c7cf7b1a3ff494e6c1b8f90389e5d518f1bb9cfa1c WHIRLPOOL e34e6dad86fbc4a4d2f727094ddfbbc7a346161b04944f6ec65bc2c27770ece5c3c8f9d46aef021a007dc3b8b4eceb2b34b9c6d6e266a9c431969043d838f7d3
 DIST mc-4.8.3.tar.xz 2042276 SHA256 bd2855116f6dc9acf5b45d2794beeba3ddfb2e71cd9ac3b692dd6629019e42a3 SHA512 db52c53b7325974fb8f5b6077ea6e802b05f2993492d486607745d0dde1dc77a305865c86c0afcd3b39b9f0abbc8ad50a45e279a4072a1481b7969aaf2032843 WHIRLPOOL 9263d9dfd35b12ea379c8ea0f0e966ccc2ad86bf292324615735db92a324487dea2c27666a8be350971991cbdbccf402549b6a904bdd2f35a208d90a1d387556
 DIST mc-4.8.4.tar.xz 2114996 SHA256 b4be11c27857ec0c0896a7cd42dd1782a03d1e4c82c83f86b5cc880f6970863e SHA512 b0827f5a88dd65a12a15dc207ab2e97d5ed40c38921ad17c22a8316a62122238bb69077100744cc2fea20b6a202812bc8e38183546fe3ef63924017269a024c7 WHIRLPOOL 65aaf0a95911eade82a00513e71ca00d13c914412f9de33269e4b216df4e64025e42a20808cc265ef5fac3388a0ec832f3a3c64aadba82f1a725b9a92d070eb0
@@ -19,14 +20,14 @@ DIST mc-4.8.5.tar.xz 2172344 SHA256 a7c8de3dde99e66edaa1ef00df4b7f609b91d598a572
 EBUILD mc-4.8.1-r1.ebuild 2434 SHA256 6a522cc7848b82af67a0782b2aba63f4826f6a676f53cbf9c0e140ad64761faa SHA512 809c3b90c3b46208472b8257e0ae6dbd057cb42908f0e35cae6374f1d147755c37967947e7b167c42ead342cd12ac47ff2ba5c4f4dd16a2b75e7cad1fa6e391e WHIRLPOOL 3747c38ffe32e2cddea165f219b367d3154470d0e6b2bcd529cf450641c1283b51cb015b40f745a195e2461b7b8da022e91130e3da4b7842f68b77cb8b94f680
 EBUILD mc-4.8.3-r2.ebuild 2381 SHA256 8c7a9774706f49d88e2ce3ebce373a03018a40b1ec2f2334e74c511f583b719e SHA512 ef0d842fbaaf65dcf9e21cff5cc919d747682f1aa7e0915732aa32f989fe94ada75eb0b336dc2a6508400c7456efdf960042b3051272ad2574196bb92791daec WHIRLPOOL 42754d1bb6a24efb12b34bc76fee5375a47e9a1fd95eafbb32fca886e89b12bd02e3e799061f391e2df8631b2eb4f3e9d8e22da0eb3488f4f0464935bf8563d5
 EBUILD mc-4.8.4-r3.ebuild 2822 SHA256 e60f673ca98a62c571573c8f9ccd9d8871dec5dfc261419fa770422475c89d3e SHA512 c2f8ee7a3dc41c67223d82c069d69dc56a79ec4c3617180edfeb0025509281aa427bb220609e317c920435d7f704bf6c26db2c3d5a48ac359a02665f9394b88b WHIRLPOOL b78abe634ac6dac72b36321ba2baf198755632e3ac6abcdbc0a984670563533d1ac5d45e2c308ee9a1ef14de59d48ec228cb91a717a577b59acb95fcc597c184
-EBUILD mc-4.8.5.ebuild 2441 SHA256 2bc80dec0b753ca729dc8b93526e5319614309cc1cb87853578cf37f8c2150a0 SHA512 5a8b373a8206de2364bb8cc1267dc4e98f31d7df093bde0cb771e01dc24191b724c1d8926e433079ac76f759429953ff12411793bca022ff8927646067d11f20 WHIRLPOOL c7b542b65682d4cbaa8374c8e80af3f4d1c020c6d9ae07a51fc3c21bfec67fa9c99a88c359456ab76ff0eefd338f5d8f6cc69395568c5a07112755473e352354
+EBUILD mc-4.8.5-r1.ebuild 2499 SHA256 ac47338bf22694cb3e4b15336f12dde90f37c3513ee888d08c4f9cdf9588bab2 SHA512 c2ea2566530609f2283bcc0b688011434e5d9a9e0bdff65facd2540f5ae39f229ac340a79d5b7ebfecc76f1a9f8a94601f9ccd82735b5371cc34bae87701e66a WHIRLPOOL 7a8b93a7cb7004d113de47c3f04c8d2ac5e2ed13acd94c221defd81dec8b18523158f1e25f54ae8b82cfbd682c7d162365333c782b48617a4f010e6bb3c7035f
 EBUILD mc-9999.ebuild 2721 SHA256 fe32560f1575e9923c99c4cfebb1741d168a30810a567700550ecce13aa1c15f SHA512 f77cc4246162f0507338299fba490fc0c21ae532409def6010a2952b5b6a4f817ce814942583c6feb2b38cceadad0b2c6e2655142cff22791e3077302e5b1bb0 WHIRLPOOL 013de6eb8943c42d6cf4e15c7ad8deb31c3b034dc5e65c25590efc5de6924d9d3a2dcbe7d5b5a0a6d36854e0af1f3a17ad56125fd29e72e003e9af18f27be17e
-MISC ChangeLog 39828 SHA256 8f323a15a8006c599539602e3f32522904ced79e88873044af29a6d20955cb2d SHA512 a50adac79f0ffdad5f70f38f6ffe2c4aa74fa123501d7cbd5feeeb22dfff80a50370cd926344bde37525f4f3b8f13d1e8a5e2a76ff5c89ad05a0f1d650007cb2 WHIRLPOOL d4810bab411b78fcbf228f53cd77b5128ae88643afdf450b3922af59ac665b7a86f5dc7de4b2f6e672a9170526de5a10ba03f5b29e072fa568845857250627c7
+MISC ChangeLog 40060 SHA256 1d8c0fc0cb7220edb708f70c75e54803b89b9ec5c64db23cd56bd9f792d23a88 SHA512 4bb482fd0e0fcfbe4e23aeac4bc70121d1a9d1342afb6ddfb24690b0518db618b397166709babad5ad5554507d65e8731a60e80945718238f60ecd90e5dd3f4e WHIRLPOOL 6c3fdf83d8c0b73ce8458427a1337fe0f5903bb94799fa41ef1d1f2fb357161ab0a44aa203098a091bbff90361a88ca22d8d8b0fca75b4c835502a4360a919fe
 MISC metadata.xml 846 SHA256 2ce5d9e8575133f3b3ef99fabbb133b0eeccf26ff346970dd034b16dd7b05fe9 SHA512 522568197614833eea1a6322b8b96f5f70f3c27d0aed734b7271d46f27852a97d6e20fa1bc3fa028c2fccb97d4b87d177f87dea1ac3d5f7d5d5330c84a39e68c WHIRLPOOL c6cee8edfb33b4160c143769f9581b90198eab76a5d324eb65795b4513609f49cd50661f4680a705be8458ef883eab5e8d491e7008c352a6359378eeff30850d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBOVuUACgkQcaHudmEf86pmUQCfdiN+YcxKQagp7urfSAi4N4Zp
-xbcAnRcv7r822pJEbtMlrqc5V+A5WE75
-=EYem
+iEYEAREIAAYFAlBSvk4ACgkQcaHudmEf86pOSACeO9OvexFLfRhmTf6gucmaSUyW
+zpMAnRGtq0L4LbErysIHRa9/eoooLBbk
+=MZ9v
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..ca4a6cbf64d0
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.5-Ticket-2881-fix-tabs.patch
@@ -0,0 +1,39 @@
+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.ebuild b/app-misc/mc/mc-4.8.5-r1.ebuild
index 0c4035147cc6..4ce6df9e82e0 100644
--- a/app-misc/mc/mc-4.8.5.ebuild
+++ b/app-misc/mc/mc-4.8.5-r1.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.ebuild,v 1.1 2012/09/10 21:02:57 slyfox Exp $
+# $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 $
 
 EAPI=4
 
@@ -43,6 +43,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+
+	epatch "${FILESDIR}"/${P}-Ticket-2881-fix-tabs.patch
 }
 
 S=${WORKDIR}/${MY_P}