Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Mon, 20 Apr 2015 17:29:24 UTC Commit: 0d60359428a82b8c371b920ba0a7bce0e59e59db https://github.com/geany/geany/commit/0d60359428a82b8c371b920ba0a7bce0e59e59...
Log Message: ----------- make: Fix incorrectly generating tags for rules content
Modified Paths: -------------- tagmanager/ctags/make.c tests/ctags/Makefile.am tests/ctags/make-variable-on-cmdline.mak tests/ctags/make-variable-on-cmdline.mak.tags tests/ctags/simple.mak.tags
Modified: tagmanager/ctags/make.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -181,7 +181,7 @@ static void findMakeTags (void) if (c == '\t') { skipLine (); /* skip rule */ - continue; + c = nextChar (); } else in_rule = FALSE; @@ -236,6 +236,7 @@ static void findMakeTags (void) } else { + fileUngetc (c); in_rule = TRUE; newTarget (name); }
Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -200,6 +200,7 @@ test_sources = \ line_directives.c \ local.c \ macros.c \ + make-variable-on-cmdline.mak \ masm.asm \ matlab_backtracking.m \ matlab_test.m \
Modified: tests/ctags/make-variable-on-cmdline.mak 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2 @@ +fixme: + cmd -g FOO=BAR
Modified: tests/ctags/make-variable-on-cmdline.mak.tags 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2 @@ +# format=tagmanager +fixme�16�0
Modified: tests/ctags/simple.mak.tags 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -4,8 +4,6 @@ B C�65536�0 D�65536�0 E�65536�0 -ENV_VAR1�65536�0 -ENV_VAR2�65536�0 F�65536�0 G�65536�0 H�65536�0
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).