Two bug fixes from Valery, check the ChangeLogs

This commit is contained in:
Miguel de Icaza 2000-05-12 20:05:58 +00:00
parent 9f9e255a00
commit 892feeb26c
3 changed files with 8 additions and 3 deletions

View File

@ -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

View File

@ -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

View File

@ -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);