From 8ece7b3dbe770bc2d5b93e8316ce63648685e7bb Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Tue, 2 Sep 2008 09:52:26 +0000
Subject: [PATCH] - do not change directory in panel to subshell directory when
 switched back     from subshell (#460633)

---
 mc-shellcwd.patch | 13 +++++++++++++
 mc.spec           |  8 +++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 mc-shellcwd.patch

diff --git a/mc-shellcwd.patch b/mc-shellcwd.patch
new file mode 100644
index 0000000..7843314
--- /dev/null
+++ b/mc-shellcwd.patch
@@ -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 ();
diff --git a/mc.spec b/mc.spec
index 6e65958..533542f 100644
--- a/mc.spec
+++ b/mc.spec
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.6.2
-Release:	5.pre1%{?dist}
+Release:	6.pre1%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
@@ -33,6 +33,7 @@ Patch18:	mc-lzma.patch
 Patch19:	mc-hintchk.patch
 Patch20:	mc-7zip.patch
 Patch21:	mc-oldrpmtags.patch
+Patch22:	mc-shellcwd.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -65,6 +66,7 @@ specific files.
 %patch19 -p1 -b .hintchk
 %patch20 -p1 -b .7zip
 %patch21 -p1 -b .oldrpmtags
+%patch22 -p1 -b .shellcwd
 
 # convert files in /lib to UTF-8
 pushd lib
@@ -202,6 +204,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc
 
 %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
 - don't try to parse obsolete RPM tags in RPM VFS (#457912),
   thanks to Milan Broz