From: Benno Schulenberg Date: Mon, 30 Jun 2014 17:47:07 +0000 (+0000) Subject: When there are no syntaxes, for example with --ignorercfiles, X-Git-Tag: v2.3.5~23 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=e94a00a26c0ec4c89b24fcc2ac6a0f5ad081fb19;p=nano.git When there are no syntaxes, for example with --ignorercfiles, do not try to find one, because that would lead to the magic database being searched, which slows down startup a lot. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5037 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index 0040fbb7..60b8dd54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-06-30 Benno Schulenberg + * src/color.c (color_update): When there are no syntaxes, for example + with --ignorercfiles, do not try to find one, because that would lead + to the magic database being searched, which slows down startup a lot. + 2014-06-29 Benno Schulenberg * src/rcfile.c: Fix compilation with --enable-tiny --enable-nanorc. * src/winio.c (parse_kbinput, get_escape_seq_kbinput): Make Ctrl-Left diff --git a/src/color.c b/src/color.c index 7e8e1a40..00af4b77 100644 --- a/src/color.c +++ b/src/color.c @@ -167,6 +167,10 @@ void color_update(void) openfile->syntax = NULL; openfile->colorstrings = NULL; + /* If the rcfiles were not read, or contained no syntaxes, get out. */ + if (syntaxes == NULL) + return; + /* If we specified a syntax override string, use it. */ if (syntaxstr != NULL) { /* If the syntax override is "none", it's the same as not having