summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-03-22 23:51:34 +0000
committerKarl Berry <karl@freefriends.org>2008-03-22 23:51:34 +0000
commit8e3fcfa2798288409645156993f445737ca8266c (patch)
tree38cce6195ca39f1465f6f817cd8cff84d01609d5
parent5fc57d735ff0b4b36c8e52c697fd8d6a34f0fb38 (diff)
conditional prompt_file_name_help_msg
git-svn-id: svn://tug.org/texlive/trunk@7090 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/cpascal.h16
-rw-r--r--Build/source/texk/web2c/tex.ch4
-rw-r--r--Build/source/texk/web2c/web2c/common.defines3
3 files changed, 20 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/cpascal.h b/Build/source/texk/web2c/cpascal.h
index f930bcd6b5b..1a830596730 100644
--- a/Build/source/texk/web2c/cpascal.h
+++ b/Build/source/texk/web2c/cpascal.h
@@ -183,6 +183,22 @@ typedef unsigned char *pointertobyte;
/* TeX et al. have a variable free, but we also need the C routine. */
#define libcfree free
+
+/* We have a system-dependent prompt in tex.ch. We don't want it in the
+ string pool, since (now that the pools are compiled into the
+ binaries), that would make the .fmt unsharable. So go through this
+ circumlotion to print a C string. The lack of the closing ) is
+ intentional, since the code adds more text sometimes. Although the
+ eof character can be changed with stty or whatever, we're certainly
+ not going to try to extract the actual value from a terminal struct.
+ Anyone who is savvy enough to change it will not be confused. */
+#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
+
+
/* Tangle removes underscores from names. Put them back for things that
are defined in C with _'s. */
diff --git a/Build/source/texk/web2c/tex.ch b/Build/source/texk/web2c/tex.ch
index 56ed3aa4a8a..c9dd995edc6 100644
--- a/Build/source/texk/web2c/tex.ch
+++ b/Build/source/texk/web2c/tex.ch
@@ -2279,10 +2279,10 @@ var k:0..buf_size; {index into |buffer|}
if e=".tex" then show_context;
@y
if (e=".tex") or (e="") then show_context;
-print_ln; print("(Type <return> to retry, or <eof> to exit");
+print_ln; fputs(prompt_file_name_help_msg, stdout);
if (e<>"") then
begin
- print(" Default file extension is `"); print(e); print("'");
+ print("; default file extension is `"); print(e); print("'");
end;
print(")"); print_ln;
@z
diff --git a/Build/source/texk/web2c/web2c/common.defines b/Build/source/texk/web2c/web2c/common.defines
index 31c70c35b1a..a6169996609 100644
--- a/Build/source/texk/web2c/web2c/common.defines
+++ b/Build/source/texk/web2c/web2c/common.defines
@@ -202,8 +202,9 @@
@define var argc;
@define var argv;
@define var kpathseaversionstring;
-@define var versionstring;
+@define var promptfilenamehelpmsg;
@define var recorderenabled;
+@define var versionstring;
{These are all set by getopt. optiontable is really _getopt_long_options.}
@define var optarg;