rpms/mc/devel mc-prompt.patch, NONE, 1.1 .cvsignore, 1.33, 1.34 mc-utf8.patch, 1.25, 1.26 mc.spec, 1.122, 1.123 sources, 1.41, 1.42

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/mc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17121

Modified Files:
	.cvsignore mc-utf8.patch mc.spec sources 
Added Files:
	mc-prompt.patch 
Log Message:
- update to new upstream CVS snapshot (2007-06-04-22)
- don't print prompts multiple times when switching
  between mc and subshell


mc-prompt.patch:

--- NEW FILE mc-prompt.patch ---
--- mc-2007-06-04-22/src/main.c.prompt	2007-06-12 15:23:25.000000000 +0200
+++ mc-2007-06-04-22/src/main.c	2007-06-12 15:45:08.000000000 +0200
@@ -453,9 +453,16 @@ do_possible_cd (const char *new_dir)
 void
 do_update_prompt (void)
 {
+    static char *old_subshell_prompt = NULL;
+
     if (update_prompt) {
-	printf ("%s", subshell_prompt);
-	fflush (stdout);
+	if (old_subshell_prompt == NULL
+	    || strcmp (old_subshell_prompt, subshell_prompt)) {
+		g_free (old_subshell_prompt);
+		old_subshell_prompt = g_strdup (subshell_prompt);
+		printf ("\r\n%s", subshell_prompt);
+		fflush (stdout);
+	}
 	update_prompt = 0;
     }
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mc/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	9 Feb 2007 11:52:26 -0000	1.33
+++ .cvsignore	12 Jun 2007 14:49:42 -0000	1.34
@@ -8,3 +8,4 @@
 mc-2006-12-28-05.tar.gz
 mc-2007-01-22-13.tar.gz
 mc-2007-01-24-03.tar.gz
+mc-2007-06-04-22.tar.gz

mc-utf8.patch:

Index: mc-utf8.patch
===================================================================
RCS file: /cvs/extras/rpms/mc/devel/mc-utf8.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mc-utf8.patch	16 Apr 2007 16:44:45 -0000	1.25
+++ mc-utf8.patch	12 Jun 2007 14:49:42 -0000	1.26
@@ -3712,7 +3712,7 @@
 +#ifdef UTF8
 +		mc_wchar_t *winput2 = mbstr_to_wchar(input2);
 +#endif /* UTF8 */
- 		if (replace_scanf || replace_regexp) {
+ 		if (replace_scanf) {
 -		    char repl_str[MAX_REPL_LEN + 2];
 +		    mc_wchar_t repl_str[MAX_REPL_LEN + 2];
  		    int ret = 0;


Index: mc.spec
===================================================================
RCS file: /cvs/extras/rpms/mc/devel/mc.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- mc.spec	16 Apr 2007 16:44:45 -0000	1.122
+++ mc.spec	12 Jun 2007 14:49:42 -0000	1.123
@@ -1,9 +1,9 @@
-%define date 2007-01-24-03
+%define date 2007-06-04-22
 
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.6.1a
-Release:	45.20070124cvs%{?dist}
+Release:	46.20070604cvs%{?dist}
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@@ -28,6 +28,7 @@
 Patch12:	mc-ipv6.patch
 Patch13:	mc-newlinedir.patch
 Patch14:	mc-cloexec.patch
+Patch15:	mc-prompt.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -54,6 +55,7 @@
 %patch12 -p1 -b .ipv6
 %patch13 -p1 -b .newlinedir
 %patch14 -p1 -b .cloexec
+%patch15 -p1 -b .prompt
 
 # convert files in /lib to UTF-8
 pushd lib
@@ -192,6 +194,11 @@
 %dir %{_libexecdir}/mc
 
 %changelog
+* Tue Jul 12 2007 Jindrich Novy <jnovy at redhat.com> 4.6.1a-46
+- update to new upstream CVS snapshot (2007-06-04-22)
+- don't print prompts multiple times when switching
+  between mc and subshell
+
 * Mon Apr 16 2007 Jindrich Novy <jnovy at redhat.com> 4.6.1a-45
 - fix segmentation fault while editing non-UTF8 files (#229383)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mc/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	9 Feb 2007 11:53:44 -0000	1.41
+++ sources	12 Jun 2007 14:49:42 -0000	1.42
@@ -1 +1 @@
-21750fc365562ee1f2b20f32defa339d  mc-2007-01-24-03.tar.gz
+f5b70d9409ac7885c50cdf388b15721e  mc-2007-06-04-22.tar.gz