summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog9
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/filename.w7
2 files changed, 8 insertions, 8 deletions
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 <peb@mppmu.mpg.de>
+
+ * tex/filename.w: Avoid redefinition of promptfilenamehelpmsg,
+ (re)use definition in ../cpascal.h.
+
2014-05-13 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
- * 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 <taco@luatex.org>
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)