From 911a5e6f033d9175fce6ab5b3beb5b5be7d8bcdd Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 14 May 2014 06:28:08 +0000 Subject: LuaTeX: Avoid redefinition of promptfilenamehelpmsg, reuse definition in cpascal.h (no need to rebuild) git-svn-id: svn://tug.org/texlive/trunk@34028 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/ChangeLog | 9 +++++++-- Build/source/texk/web2c/luatexdir/tex/filename.w | 7 +------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'Build/source/texk/web2c/luatexdir') diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index dca6d3900b3..accf5a718fa 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,7 +1,12 @@ +2014-05-14 Peter Breitenlohner + + * tex/filename.w: Avoid redefinition of promptfilenamehelpmsg, + (re)use definition in ../cpascal.h. + 2014-05-13 Akira Kakuto - * tex/filename.w: print the promptfilenamehelpmsg as usual tex - also in lua(jit)tex. + * tex/filename.w: Print the usual TeX promptfilenamehelpmsg also + in lua(jit)tex. 2014-04-10 Taco Hoekwater diff --git a/Build/source/texk/web2c/luatexdir/tex/filename.w b/Build/source/texk/web2c/luatexdir/tex/filename.w index 9f9557b32d6..697f413f2fa 100644 --- a/Build/source/texk/web2c/luatexdir/tex/filename.w +++ b/Build/source/texk/web2c/luatexdir/tex/filename.w @@ -232,11 +232,6 @@ char *pack_job_name(const char *s) ready for another attempt at file opening. @c -#ifdef WIN32 -#define promptfilenamehelpmsg "(Press Enter to retry, or Control-Z to exit)" -#else -#define promptfilenamehelpmsg "(Press Enter to retry, or Control-D to exit)" -#endif char *prompt_file_name(const char *s, const char *e) { int k; /* index into |buffer| */ @@ -262,7 +257,7 @@ char *prompt_file_name(const char *s, const char *e) if ((strcmp(e, ".tex") == 0) || (strcmp(e, "") == 0)) show_context(); if (strcmp(s, "input file name") == 0) - tprint_nl(promptfilenamehelpmsg); + tprint_nl(promptfilenamehelpmsg ")"); tprint_nl("Please type another "); tprint(s); if (interaction < scroll_mode) -- cgit v1.2.3