diff options
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/inputstack.w | 9 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/printing.w | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 4d939432d87..31948d3f717 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,10 @@ +2011-09-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * tex/printing.w (print_file_line): Bug fix: avoid uninitialized + lineno - from ../tex.ch. + * tex/inputstack.w: Slightly reformulate printing of current + line - from ../etexdir/etex.ch. + 2011-08-04 Magnus Granberg <zorry@gentoo.org> * luatex.c: Do not #include empty file <kpathsea/recorder.h>. diff --git a/Build/source/texk/web2c/luatexdir/tex/inputstack.w b/Build/source/texk/web2c/luatexdir/tex/inputstack.w index 857f86dfe6e..f52ca45c4fb 100644 --- a/Build/source/texk/web2c/luatexdir/tex/inputstack.w +++ b/Build/source/texk/web2c/luatexdir/tex/inputstack.w @@ -307,12 +307,13 @@ void show_context(void) print_int(iname - 1); print_char('>'); }; - } else if (iindex != in_open) { /* input from a pseudo file */ - tprint_nl("l."); - print_int(line_stack[iindex + 1]); } else { tprint_nl("l."); - print_int(line); + if (iindex == in_open) { + print_int(line); + } else { /* input from a pseudo file */ + print_int(line_stack[iindex + 1]); + } } print_char(' '); PSEUDO_PRINT_THE_LINE(); diff --git a/Build/source/texk/web2c/luatexdir/tex/printing.w b/Build/source/texk/web2c/luatexdir/tex/printing.w index 9ea3fd98014..df28f3d3c04 100644 --- a/Build/source/texk/web2c/luatexdir/tex/printing.w +++ b/Build/source/texk/web2c/luatexdir/tex/printing.w @@ -946,7 +946,7 @@ void print_file_line(void) if (level == in_open) print_int(line); else - print_int(line_stack[iindex + 1 - (in_open - level)]); + print_int(line_stack[level + 1]); tprint(": "); } } |