diff --git a/moo.mprj b/moo.mprj index 37b765a8..7595760f 100644 --- a/moo.mprj +++ b/moo.mprj @@ -34,7 +34,7 @@ - /home/muntyan/projects/gap/gap4r4/src/ + /home/muntyan/projects/moo/ --g-fatal-warnings --new-app --mode=project medit/medit diff --git a/moo/mooedit/gtksourceview/upstream/gtksourcelanguage-parser-2.c b/moo/mooedit/gtksourceview/upstream/gtksourcelanguage-parser-2.c index c0fe5b19..a3a27ad9 100644 --- a/moo/mooedit/gtksourceview/upstream/gtksourcelanguage-parser-2.c +++ b/moo/mooedit/gtksourceview/upstream/gtksourcelanguage-parser-2.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include "gtksourceview-i18n.h" @@ -1097,7 +1098,7 @@ expand_regex (ParserState *parser_state, if (egg_regex_get_backrefmax (compiled) > 0) { g_set_error (error, PARSER_ERROR, PARSER_ERROR_MALFORMED_REGEX, - _("in regex '%s': backreferences are not supported"), + _("in regex '%s': backreferences are not supported"), regex); egg_regex_free (compiled); return NULL; @@ -1582,7 +1583,7 @@ file_parse (gchar *filename, ParserState *parser_state; xmlTextReader *reader = NULL; int ret; - int fd; + int fd = -1; GError *tmp_error = NULL; GtkSourceLanguagesManager *lm; const gchar *rng_lang_schema; @@ -1666,9 +1667,13 @@ file_parse (gchar *filename, if (tmp_error != NULL) goto error; + close (fd); + return TRUE; error: + if (fd != -1) + close (fd); g_propagate_error (error, tmp_error); return FALSE; }