diff options
| author | Paul Eggert | 2011-11-13 20:35:22 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-13 20:35:22 -0800 |
| commit | c3ca24d48c10fb771ee02eb58f7d49bd82d6306e (patch) | |
| tree | e707b79a846623490feea39a4dceb86dd218eb4d /lib-src | |
| parent | 6a0bf43d7c5961297aa5024aec534e5bab73c8af (diff) | |
| parent | 56632ce4cd8616f0613e8734d62ec5e2f833c7dc (diff) | |
| download | emacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.tar.gz emacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.zip | |
Merge from trunk.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/etags.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/etags.c b/lib-src/etags.c index cdcc6461a64..5bd8077265f 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c | |||
| @@ -6097,7 +6097,7 @@ readline (linebuffer *lbp, FILE *stream) | |||
| 6097 | lineno += 1; /* increment global line number */ | 6097 | lineno += 1; /* increment global line number */ |
| 6098 | charno += result; /* increment global char number */ | 6098 | charno += result; /* increment global char number */ |
| 6099 | 6099 | ||
| 6100 | /* Honour #line directives. */ | 6100 | /* Honor #line directives. */ |
| 6101 | if (!no_line_directive) | 6101 | if (!no_line_directive) |
| 6102 | { | 6102 | { |
| 6103 | static bool discard_until_line_directive; | 6103 | static bool discard_until_line_directive; |