summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2015-11-19 23:26:50 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2015-11-19 23:26:50 +0000
commit19c4713afbf09dfe45e91473b3d053d24e384b28 (patch)
tree1863449484c81d0d2d803be802ba4e2517aa8c60 /Build/source/texk
parentf81107e65c57da66b4c056a1c9e723dbd4e6911c (diff)
web2c/luatexdir: Sync with the upstream:
git-svn-id: svn://tug.org/texlive/trunk@38901 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/web2c/luatexdir/NEWS4
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex.c6
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/expand.w2
3 files changed, 6 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/luatexdir/NEWS b/Build/source/texk/web2c/luatexdir/NEWS
index 41b31037ef6..d99f071d993 100644
--- a/Build/source/texk/web2c/luatexdir/NEWS
+++ b/Build/source/texk/web2c/luatexdir/NEWS
@@ -2,7 +2,7 @@
This file is in the public domain.
==============================================================
-Luatex beta-0.85.0 was released 2015111400 (5509)
+Luatex beta-0.85.0 was released 2015111400 (5550)
==============================================================
-- roadmap
@@ -2564,7 +2564,7 @@ Other news:
we probably introduced new problems as well).
* Most (all?) files now have a corrected Copyright header,
- and link in $Id: NEWS 5538 2015-11-18 08:36:25Z luigi $ and $URL: https://foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/NEWS $ into the object file.
+ and link in $Id: NEWS 5550 2015-11-19 13:23:59Z luigi $ and $URL: https://foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/NEWS $ into the object file.
* Some unnecessary files were removed from the distribution.
diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c
index 43e1079191a..64393bad697 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.c
+++ b/Build/source/texk/web2c/luatexdir/luatex.c
@@ -29,7 +29,7 @@
int luatex_svn = luatex_svn_revision;
int luatex_version = 85; /* \.{\\luatexversion} */
int luatex_revision = '0'; /* \.{\\luatexrevision} */
-int luatex_date_info = 2015111400; /* the compile date is now hardwired */
+int luatex_date_info = 2015111900; /* the compile date is now hardwired */
const char *luatex_version_string = "beta-0.85.0";
const char *engine_name = my_name; /* the name of this engine */
@@ -438,8 +438,8 @@ int runsystem(const char *cmd)
else if (allow == 2)
status = system(safecmd);
/* Not really meaningful, but we have to manage the return value of system. */
- if (status != 0)
- fprintf(stderr,"system returned with code %d\n", status);
+ if (status==-1)
+ fprintf(stderr,"system returned with code -1\n");
if (safecmd)
free(safecmd);
diff --git a/Build/source/texk/web2c/luatexdir/tex/expand.w b/Build/source/texk/web2c/luatexdir/tex/expand.w
index 7ebb7b91ae0..098b6808373 100644
--- a/Build/source/texk/web2c/luatexdir/tex/expand.w
+++ b/Build/source/texk/web2c/luatexdir/tex/expand.w
@@ -275,7 +275,7 @@ void expand(void)
do_variable();
break;
case feedback_cmd:
- do_variable();
+ do_feedback();
break;
default:
/* Complain about an undefined macro */