[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Update l3kernel to 2020-10-05 (90008d5f)

[Joseph Wright]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/90008d5f019024bdc1d50288fae0f2b1cebce9e9

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

commit 90008d5f019024bdc1d50288fae0f2b1cebce9e9
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Oct 5 08:57:37 2020 +0100

    Update l3kernel to 2020-10-05
    
    One late breaking fix added


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

90008d5f019024bdc1d50288fae0f2b1cebce9e9
 texmf/tex/latex/l3kernel/expl3-code.tex | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/texmf/tex/latex/l3kernel/expl3-code.tex b/texmf/tex/latex/l3kernel/expl3-code.tex
index 57b93d00..14b32595 100644
--- a/texmf/tex/latex/l3kernel/expl3-code.tex
+++ b/texmf/tex/latex/l3kernel/expl3-code.tex
@@ -28446,7 +28446,9 @@
     \exp_not:N \str_if_eq:nnTF {#1} { \exp_not:N \protect }
       { \exp_not:N \__text_expand_protect:N }
       {
-        \cs_if_exist:cTF { @current at cmd }
+        \bool_lazy_and:nnTF
+          { \cs_if_exist_p:N \fmtname }
+          { \str_if_eq_p:Vn \fmtname { LaTeX2e } }
           { \exp_not:N \__text_expand_encoding:N #1 }
           { \exp_not:N \__text_expand_replace:N #1 }
       }
@@ -28471,16 +28473,11 @@
   }
 \cs_new:Npn \__text_expand_encoding:N #1
   {
-    \cs_if_eq:NNTF #1 \@current at cmd
+    \bool_lazy_or:nnTF
+      { \cs_if_eq_p:NN  #1 \@current at cmd }
+      { \cs_if_eq_p:NN  #1 \@changed at cmd }
       { \exp_after:wN \__text_expand_loop:w \__text_expand_encoding_escape:NN }
-      {
-        \cs_if_eq:NNTF #1 \@changed at cmd
-          {
-            \exp_after:wN \__text_expand_loop:w
-              \__text_expand_encoding_escape:NN
-          }
-          { \__text_expand_replace:N #1 }
-      }
+      { \__text_expand_replace:N #1 }
   }
 \cs_new:Npn \__text_expand_encoding_escape:NN #1#2 { \exp_not:n {#1} }
 \cs_new:Npn \__text_expand_replace:N #1