summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/mplibdir/mp.w4
-rw-r--r--Build/source/texk/web2c/mplibdir/mpost.w4
3 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index f78df4f1dc2..8137cb2599d 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-29 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * mpost.w, mp.w: Imported from MetaPost trunk.
+
2014-01-17 Peter Breitenlohner <peb@mppmu.mpg.de>
* mptrap.test (removed): Renamed ...
diff --git a/Build/source/texk/web2c/mplibdir/mp.w b/Build/source/texk/web2c/mplibdir/mp.w
index 3b9a81e2f74..682acaaeb54 100644
--- a/Build/source/texk/web2c/mplibdir/mp.w
+++ b/Build/source/texk/web2c/mplibdir/mp.w
@@ -1,4 +1,4 @@
-% $Id: mp.w 1928 2013-12-16 09:08:23Z taco $
+% $Id: mp.w 1932 2014-01-29 15:33:50Z taco $
%
% This file is part of MetaPost;
% the MetaPost program is in the public domain.
@@ -4670,7 +4670,7 @@ static mp_sym mp_frozen_primitive (MP mp, const char *ss, halfword c,
mp_sym str = mp_frozen_id_lookup (mp, s, strlen (ss), true);
mp_xfree (s);
str->type = c;
- set_number_from_scaled (str->v.data.n, o);
+ str->v.data.indep.serial = o;
return str;
}
diff --git a/Build/source/texk/web2c/mplibdir/mpost.w b/Build/source/texk/web2c/mplibdir/mpost.w
index fb4d1967ac1..ab444e20f9c 100644
--- a/Build/source/texk/web2c/mplibdir/mpost.w
+++ b/Build/source/texk/web2c/mplibdir/mpost.w
@@ -1,4 +1,4 @@
-% $Id: mpost.w 1916 2013-06-13 10:19:49Z taco $
+% $Id: mpost.w 1931 2014-01-29 12:19:20Z taco $
%
% This file is part of MetaPost;
% the MetaPost program is in the public domain.
@@ -546,7 +546,7 @@ static char *mpost_find_file(MP mp, const char *fname, const char *fmode, int ft
char *s;
(void)mp;
s = NULL;
- if ((fmode[0]=='r' && !kpse_in_name_ok(fname)) ||
+ if (fname == NULL || (fmode[0]=='r' && !kpse_in_name_ok(fname)) ||
(fmode[0]=='w' && !kpse_out_name_ok(fname)))
return NULL; /* disallowed filename */
if (fmode[0]=='r') {