* src/input.c (enum input_type): Add additional types, to shave

time off the common case.
(push_wrapup): Wrapped strings remember location.
(push_string_finish): Normal strings carry no location.
(push_file): Start new files uninitialized.
(peek_input, next_char_1): Optimize common cases by updating
location only on new input types.
(pop_input): Update to honor new input types.
(skip_line, push_string_finish): Fix regression in previous patch
when dnl is not followed by newline in included file.
(push_string_init): Initialize all fields of INPUT_STRING sooner.
(peek_token): Simplify.
(peek_input): Don't pop input files on peek, so that __file__ and
__line__ as last token of include file work correctly.
* doc/m4.texinfo (History): Mention 1.4.8.
(Answers): Split into sections, one per answer.
(Improved exch, Improved cleardivert, Improved fatal_error): New
nodes.
(Dnl, M4wrap, Location, M4exit, Improved fatal_error): Update to
new m4wrap location semantics.
(Changeword): Add 

1 files changed, 5 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index ed03d749..1f5f2673 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,11 @@ Version 1.4.8 - ?? ??? 2006, by ??  (CVS version 1.4.7a)
   `errprint' macro, now always cause a non-zero exit status.
 * Warnings and errors issued during macro expansion are now consistently
   reported at the line where the macro name was detected, rather than
-  where the close parenthesis resides.
+  where the close parenthesis resides.  Text wrapped by `m4wrap' now
+  remembers the location that was in effect when m4wrap was invoked,
+  rather than changing to line 0 and the empty string for a file.  The
+  macros `__line__' and `__file__' now work correctly even as the last
+  token in an included file.
 
 Version 1.4.7 - 25 September 2006, by Eric Blake  (CVS version 1.4.6a)