etoolbox (1dec16)

git-svn-id: svn://tug.org/texlive/trunk@42615 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 10 insertions, 5 deletions

diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
index 6448fe2669f..75a01547a59 100644
--- a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
+++ b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
@@ -1,5 +1,5 @@
 \ProvidesFile{etoolbox.def}
-  [2015/08/02 v2.2a etoolbox debug messages (JAW)]
+  [2016/12/01 v2.2b etoolbox debug messages (JAW)]
 
 \begingroup
 \makeatletter
diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
index 35549423a15..da8327b8338 100644
--- a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
+++ b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
@@ -12,7 +12,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{etoolbox}
-  [2015/08/02 v2.2a e-TeX tools for LaTeX (JAW)]
+  [2016/12/01 v2.2b e-TeX tools for LaTeX (JAW)]
 
 \begingroup
 \@ifundefined{eTeXversion}
@@ -238,7 +238,14 @@
 
 \newrobustcmd{\ifdefltxprotect}[1]{%
   \begingroup
+  \edef\etb@resrvda{\string#1}%
+  \def\etb@resrvdb{#1}%
+  \edef\etb@resrvdb{\expandafter\strip@prefix\meaning\etb@resrvdb}%
   \edef\etb@resrvda{%
+    \ifx\etb@resrvda\etb@resrvdb
+      \noexpand\x@protect
+      \noexpand#1%
+    \fi
     \noexpand\protect\expandafter\noexpand
     \csname\expandafter\@gobble\string#1 \endcsname}%
   \expandafter\endgroup\ifx#1\etb@resrvda
@@ -1233,9 +1240,7 @@
               \@tempswafalse}}
           {\protected\edef#1{\expandonce\etb@resrvda}}%
         \if@tempswa
-          \ifcsdef{\string#1 }
-            {}
-            {\csundef{\expandafter\@gobble\string#1 }}%
+          \csundef{\expandafter\@gobble\string#1 }%
         \fi
         \undef\etb@resrvda}
        {\etb@error{\string#1 not a macro}\@eha}}}