[latex3-commits] [git/LaTeX3-latex3-latex3] master: Fix l3auxdata for new \file_get:nnN (0cf8ea9)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/0cf8ea9406204f62092c6a46de617ecd30130678

>---------------------------------------------------------------

commit 0cf8ea9406204f62092c6a46de617ecd30130678
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Jan 16 17:48:48 2019 +0000

    Fix l3auxdata for new \file_get:nnN


>---------------------------------------------------------------

0cf8ea9406204f62092c6a46de617ecd30130678
 l3trial/l3auxdata/l3auxdata.dtx |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/l3trial/l3auxdata/l3auxdata.dtx b/l3trial/l3auxdata/l3auxdata.dtx
index 4dacde6..575ebee 100644
--- a/l3trial/l3auxdata/l3auxdata.dtx
+++ b/l3trial/l3auxdata/l3auxdata.dtx
@@ -681,13 +681,12 @@ Don't~ look~ here:~ check~ your~ console~ output!
 % \paragraph{Variables and variants}
 %
 %    \begin{macrocode}
-\cs_set:Nn \tl_gset_from_file_x:Nnn { \CatchFileEdef #1 {#3} {#2} }
-\cs_set:Nn \tl_gset_from_file:Nnn   { \CatchFileDef  #1 {#3} {#2} }
-\cs_generate_variant:Nn \tl_gset_from_file_x:Nnn {c}
 
 \tl_new:N \l_auxdata_filename_tl
 \tl_new:N \g_@@_cache_tl
 
+\tl_new:N \l_@@_internal_tl
+
 \cs_generate_variant:Nn \prop_put:Nnn {Nxx}
 \cs_generate_variant:Nn \iow_now:Nn {cn,cx}
 \cs_generate_variant:Nn \iow_shipout:Nn {cx}
@@ -1005,10 +1004,13 @@ Don't~ look~ here:~ check~ your~ console~ output!
         \prop_get:NnNF \g_@@_tags_prop {#1} \l_auxdata_this_ccname_tl {\ERROR}
         \prop_get:NVNF \g_@@_cc_prop \l_auxdata_this_ccname_tl \l_auxdata_cc_tl {\ERROR}
 
-        \tl_gset_from_file_x:cnn
+        \file_get:nnN
+          { \@@_read_setup: \l_auxdata_cc_tl  }
           { g_auxdata_ #1 _ #2 _tl }
-          { \@@_read_setup: \l_auxdata_cc_tl }
+          \l_@@_internal_tl
+        \tl_gset_eq:cN
           { \l_auxdata_filename_tl }
+          \l_@@_internal_tl
       }
   }
 %    \end{macrocode}