- do not change directory in panel to subshell directory when switched back

from subshell (#460633)
This commit is contained in:
Jindrich Novy 2008-09-02 09:52:26 +00:00
parent e78c6c97b1
commit 8ece7b3dbe
2 changed files with 20 additions and 1 deletions

13
mc-shellcwd.patch Normal file
View File

@ -0,0 +1,13 @@
diff -up mc-4.6.2-pre1/src/subshell.c.shellcwd mc-4.6.2-pre1/src/subshell.c
--- mc-4.6.2-pre1/src/subshell.c.shellcwd 2008-09-02 11:28:31.000000000 +0200
+++ mc-4.6.2-pre1/src/subshell.c 2008-09-02 11:41:39.000000000 +0200
@@ -562,9 +562,6 @@ int invoke_subshell (const char *command
feed_subshell (how, FALSE);
- if (new_dir && subshell_alive && strcmp (subshell_cwd, current_panel->cwd))
- *new_dir = subshell_cwd; /* Make MC change to the subshell's CWD */
-
/* Restart the subshell if it has died by SIGHUP, SIGQUIT, etc. */
while (!subshell_alive && !quit && use_subshell)
init_subshell ();

View File

@ -1,7 +1,7 @@
Summary: User-friendly text console file manager and visual shell Summary: User-friendly text console file manager and visual shell
Name: mc Name: mc
Version: 4.6.2 Version: 4.6.2
Release: 5.pre1%{?dist} Release: 6.pre1%{?dist}
Epoch: 1 Epoch: 1
License: GPLv2 License: GPLv2
Group: System Environment/Shells Group: System Environment/Shells
@ -33,6 +33,7 @@ Patch18: mc-lzma.patch
Patch19: mc-hintchk.patch Patch19: mc-hintchk.patch
Patch20: mc-7zip.patch Patch20: mc-7zip.patch
Patch21: mc-oldrpmtags.patch Patch21: mc-oldrpmtags.patch
Patch22: mc-shellcwd.patch
%description %description
Midnight Commander is a visual shell much like a file manager, only Midnight Commander is a visual shell much like a file manager, only
@ -65,6 +66,7 @@ specific files.
%patch19 -p1 -b .hintchk %patch19 -p1 -b .hintchk
%patch20 -p1 -b .7zip %patch20 -p1 -b .7zip
%patch21 -p1 -b .oldrpmtags %patch21 -p1 -b .oldrpmtags
%patch22 -p1 -b .shellcwd
# convert files in /lib to UTF-8 # convert files in /lib to UTF-8
pushd lib pushd lib
@ -202,6 +204,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libexecdir}/mc %dir %{_libexecdir}/mc
%changelog %changelog
* Tue Sep 2 2008 Jindrich Novy <jnovy@redhat.com> 4.6.2-6.pre1
- do not change directory in panel to subshell directory
when switched back from subshell (#460633)
* Tue Aug 5 2008 Jindrich Novy <jnovy@redhat.com> 4.6.2-5.pre1 * Tue Aug 5 2008 Jindrich Novy <jnovy@redhat.com> 4.6.2-5.pre1
- don't try to parse obsolete RPM tags in RPM VFS (#457912), - don't try to parse obsolete RPM tags in RPM VFS (#457912),
thanks to Milan Broz thanks to Milan Broz