diff --git a/gtkedit/editcmddef.h b/gtkedit/editcmddef.h
index 4aded1873..83b403014 100644
--- a/gtkedit/editcmddef.h
+++ b/gtkedit/editcmddef.h
@@ -152,7 +152,7 @@
    it into the text, which is annoying.
  */
 #define CK_Pipe_Block(i)	(1000+(i))
-#define SHELL_COMMANDS_i {"/.cedit/edit.indent.rc", "/.cedit/edit.spell.rc", /* and so on */ 0};
+#define SHELL_COMMANDS_i {"/edit.indent.rc", "/edit.spell.rc", /* and so on */ 0};
 #define CK_Macro(i)		(2000+(i))
 #define CK_Last_Macro		CK_Macro(0x7FFF)
 #else
diff --git a/src/ChangeLog b/src/ChangeLog
index 3571a6937..f85796e4f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-11  Valery Kornienkov  <vlk@dimavb.st.simbirsk.su>
+
+	src/user.c: fix segfault when Shift-F4, Shift-F1, so when menu
+       content condition y , macro %y
+	
 2000-05-04  Valery Kornienkov  <vlk@dimavb.st.simbirsk.su>
 
        * src/user.c: Add macro %k it is block file name
diff --git a/src/user.c b/src/user.c
index 83807584e..89fa39e6b 100644
--- a/src/user.c
+++ b/src/user.c
@@ -215,7 +215,7 @@ char *expand_format (char c, int quote)
 	        return g_strnfill (s_editwidget->curs_col, ' ');
         break;
     case 'y': /* syntax type */
-        if (s_editwidget)
+        if (s_editwidget && s_editwidget->syntax_type)
 	        return g_strdup (s_editwidget->syntax_type);
         break;
     case 'e': 
@@ -369,7 +369,7 @@ static char *test_condition (char *p, int *condition)
 	    *condition = panel && regexp_match (arg, panel->dir.list [panel->selected].fname, match_file);
 	    break;
 	case 'y': /* syntax pattern */
-            if (s_editwidget) {
+            if (s_editwidget && s_editwidget->syntax_type) {
 	        p = extract_arg (p, arg);
 	        *condition = panel &&
                     regexp_match (arg, s_editwidget->syntax_type, match_normal);