[Pkg-mc-commits] r336 - in trunk/debian/patches: . bugs

[Yury Zaytsev]

Author: zaytsev-guest
Date: 2009-12-29 16:05:10 +0000 (Tue, 29 Dec 2009)
New Revision: 336

Added:
   trunk/debian/patches/bugs/1906_editor_crash.patch
Modified:
   trunk/debian/patches/series
Log:
Cherry-picked bug fix for editor startup crash.



Added: trunk/debian/patches/bugs/1906_editor_crash.patch
===================================================================
--- trunk/debian/patches/bugs/1906_editor_crash.patch	                        (rev 0)
+++ trunk/debian/patches/bugs/1906_editor_crash.patch	2009-12-29 16:05:10 UTC (rev 336)
@@ -0,0 +1,20 @@
+Ticket #1906: edit: crash on file open whoen some Syntax files are absent (reported by pavlinux)
+diff --git a/edit/syntax.c b/edit/syntax.c
+index b8784d5..7479483 100644
+--- a/edit/syntax.c
++++ b/edit/syntax.c
+@@ -693,11 +693,10 @@ static FILE *open_include_file (const char *filename)
+     g_free (error_file_name);
+     error_file_name = g_strconcat (mc_home, PATH_SEP_STR, "syntax", PATH_SEP_STR,
+ 				   filename, (char *) NULL);
+-
+-    if ((f = fopen (error_file_name, "r"))) {
+-	g_free (error_file_name);
++    f = fopen (error_file_name, "r");
++    if (f)
+ 	return f;
+-    }
++
+     g_free (error_file_name);
+     error_file_name = g_strconcat (mc_home_alt, PATH_SEP_STR "syntax" PATH_SEP_STR,
+ 				   filename, (char *) NULL);

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2009-12-29 15:51:25 UTC (rev 335)
+++ trunk/debian/patches/series	2009-12-29 16:05:10 UTC (rev 336)
@@ -8,3 +8,4 @@
 debian/10_use_default_images_viewer.patch
 debian/1462_fix_wrong_path_to_wrapper_script_540238.patch
 bugs/84_use_dvicat_instead_of_dvi2tty.patch
+bugs/1906_editor_crash.patch
\ No newline at end of file