From e81a43fac4abcd343171b8e68c4dc313080552ee Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Wed, 14 May 2014 11:51:26 +0000 Subject: [PATCH] Stopping the search when a magic matched. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4886 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 1 + src/color.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 10d2b5d1..3c87289b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * src/color.c (color_update): Open the magic database only when actually going to use it, and close it afterward. * doc/syntax/{perl.nanorc,xml.nanorc}: Improve two magic regexes. + * src/color.c (color_update): Stop seeking when a magic matched. 2014-05-13 Benno Schulenberg * src/text.c (do_linter): Make an error message somewhat clearer. diff --git a/src/color.c b/src/color.c index ee831210..6e807c42 100644 --- a/src/color.c +++ b/src/color.c @@ -310,6 +310,8 @@ void color_update(void) if (not_compiled) nfreeregex(&e->ext); } + if (openfile->syntax) + break; } if (stat(openfile->filename, &fileinfo) == 0) magic_close(cookie); -- 2.39.5