Date: Tue, 9 Dec 2014 13:44:20 +0100 From: Tijl Coosemans <tijl@FreeBSD.org> To: Kurt Jaeger <pi@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r374372 - in head/misc/mc: . files Message-ID: <20141209134420.22b42d62@kalimero.tijl.coosemans.org> In-Reply-To: <201412091203.sB9C3E6t019510@svn.freebsd.org> References: <201412091203.sB9C3E6t019510@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 9 Dec 2014 12:03:14 +0000 (UTC) Kurt Jaeger <pi@FreeBSD.org> wrote: > Author: pi > Date: Tue Dec 9 12:03:13 2014 > New Revision: 374372 > URL: https://svnweb.freebsd.org/changeset/ports/374372 > QAT: https://qat.redports.org/buildarchive/r374372/ > > Log: > misc/mc: re-add small patch that was deleted in r369133 > > Change: > save/restore the sub-shell's screen on Ctrl+O and/or command execution > > PR: 194627 > Submitted by: andriys@gmail.com > > Modified: > head/misc/mc/Makefile > head/misc/mc/files/patch-lib__tty__win.c > > Modified: head/misc/mc/Makefile > ============================================================================== > --- head/misc/mc/Makefile Tue Dec 9 11:42:34 2014 (r374371) > +++ head/misc/mc/Makefile Tue Dec 9 12:03:13 2014 (r374372) > @@ -3,7 +3,7 @@ > > PORTNAME= mc > PORTVERSION= 4.8.13 > -PORTREVISION= 1 > +PORTREVISION= 2 > CATEGORIES= misc shells > MASTER_SITES= http://ftp.midnight-commander.org/ \ > http://ftp.osuosl.org/pub/midnightcommander/ \ > > Modified: head/misc/mc/files/patch-lib__tty__win.c > ============================================================================== > --- head/misc/mc/files/patch-lib__tty__win.c Tue Dec 9 11:42:34 2014 (r374371) > +++ head/misc/mc/files/patch-lib__tty__win.c Tue Dec 9 12:03:13 2014 (r374372) > @@ -1,5 +1,14 @@ > --- lib/tty/win.c.orig 2014-09-02 09:23:58 UTC > +++ lib/tty/win.c > ++@@ -95,7 +95,7 @@ > ++ void > ++ do_enter_ca_mode (void) > ++ { > ++- if (mc_global.tty.xterm_flag && smcup != NULL) > +++ if (mc_global.tty.xterm_flag) > ++ { > ++ fprintf (stdout, /* ESC_STR ")0" */ ESC_STR "7" ESC_STR "[?47h"); > ++ fflush (stdout); There's one column of pluses too many here. The patch won't apply like this.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20141209134420.22b42d62>