1 files changed, 9 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
index 6faa1110ad1..39a6bbaef22 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
@@ -13,7 +13,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: l3basics.dtx Copyright (C) 1990-2011 The LaTeX3 project
+%% File: l3basics.dtx Copyright (C) 1990-2012 The LaTeX3 project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3basics.dtx 3090 2011-12-23 03:12:53Z bruno $
+\GetIdInfo$Id: l3basics.dtx 3196 2012-01-15 09:44:05Z joseph $
   {L3 Experimental basic definitions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -141,13 +141,9 @@
 \cs_set:Npn \use:c #1 { \cs:w #1 \cs_end: }
 \cs_set_protected:Npn \use:x #1
   {
-    \group_begin:
-      \cs_set_nopar:Npx \cs_tmp:w {#1}
-      \exp_after:wN
-    \group_end:
-    \cs_tmp:w
+    \cs_set_nopar:Npx \l_exp_internal_tl {#1}
+    \l_exp_internal_tl
   }
-\cs_set:Npn \cs_tmp:w { }
 \cs_set:Npn \use:n    #1       {#1}
 \cs_set:Npn \use:nn   #1#2     {#1#2}
 \cs_set:Npn \use:nnn  #1#2#3   {#1#2#3}
@@ -618,9 +614,11 @@
 \cs_new_protected:Npn
   \cs_generate_from_arg_count_aux:nwn #1 #2 \fi: #3
   { \fi: #3 #1 }
-\cs_new_nopar:Npn \cs_generate_from_arg_count:cNnn
+\cs_new_protected_nopar:Npn \cs_generate_from_arg_count:cNnn
   { \exp_args:Nc \cs_generate_from_arg_count:NNnn }
-\cs_new:Npn \cs_generate_from_arg_count_error_msg:Nn #1#2
+\cs_new_protected_nopar:Npn \cs_generate_from_arg_count:Ncnn
+  { \exp_args:NNc \cs_generate_from_arg_count:NNnn }
+\cs_new_protected:Npn \cs_generate_from_arg_count_error_msg:Nn #1#2
   {
     \msg_kernel_error:nnxx { kernel } { bad-number-of-arguments }
       { \token_to_str:N #1 } { \int_eval:n {#2} }
@@ -710,7 +708,7 @@
 \cs_new:Npn \kernel_register_show:N #1
   {
     \cs_if_exist:NTF #1
-     { \tex_showthe:D #1 }
+     { \tex_showthe:D \use:n #1 }
      {
        \msg_kernel_error:nnx { kernel } { variable-not-defined }
          { \token_to_str:N #1 }
@@ -767,14 +765,6 @@
 \cs_new_eq:NN \prg_break_point:n \use:n
 \cs_new:Npn \prg_map_break: #1 \prg_break_point:n #2 { #2 }
 \cs_new:Npn \prg_map_break:n #1 #2 \prg_break_point:n #3 { #3 #1 }
-\cs_new_eq:NN \c_luatex_is_engine_bool \luatex_if_engine_p:
-\cs_new_eq:NN \c_pdftex_is_engine_bool \pdftex_if_engine_p:
-\cs_new_eq:NN \c_xetex_is_engine_bool  \xetex_if_engine_p:
-\cs_set:Npn \use_i_after_fi:nw #1 \fi: { \fi: #1 }
-\cs_set:Npn \use_i_after_else:nw #1 \else: #2 \fi: { \fi: #1 }
-\cs_set:Npn \use_i_after_or:nw #1 \or: #2 \fi: { \fi: #1 }
-\cs_set:Npn \use_i_after_orelse:nw #1#2#3 \fi: { \fi: #1 }
-\tex_let:D \cs_set_eq:NwN \tex_let:D
 %% 
 %%
 %% End of file `l3basics.sty'.