(AS_ESCAPE): Make the pattern a bit simpler

diff --git a/ChangeLog b/ChangeLog
index cb6693402a071d4657fbcb2f78f5baa4ef636da0..4acb849d55ccafceb7149c9986902b8ecc5af67c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-24  Stepan Kasal  <kasal@ucw.cz>
+
+       * lib/m4sugar/m4sh.m4 (AS_ESCAPE): Make the pattern a bit simpler;
+         use \& insetad of \1.
+
 2005-05-24  Stepan Kasal  <kasal@ucw.cz>
 
        * lib/m4sugar/m4sh.m4 (_AS_ECHO_UNQUOTED): Move the macro lower;

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index dad772e1d121138e1416241ed823dc7dfe5e6cac..0eb6d3bb3a559d56d436116dcc69223043850855 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -502,8 +502,8 @@ $as_unset $1 || test "${$1+set}" != set || { $1=$2; export $1; }])
 # Escape the CHARS in STRING.
 m4_define([AS_ESCAPE],
 [m4_bpatsubst([$1],
-            m4_ifval([$2], [[\([$2]\)]], [[\([\"$`]\)]]),
-            [\\\1])])
+            m4_dquote(m4_default([$2], [\"$`])),
+            [\\\&])])
 
 
 # _AS_QUOTE_IFELSE(STRING, IF-MODERN-QUOTATION, IF-OLD-QUOTATION)