Revert the last change for \x handling in Tcl.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 4b0b4e49cb6a3c6746ce93bc97179157ebcf1fd4..6fe4548bdde1a5e39de81815e8817817f3d8c1aa 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,7 +1,7 @@
 2013-06-25  Daiki Ueno  <ueno@gnu.org>
 
-       Fix handling of \x and \u escape sequences in Tcl.
-       * x-tcl.c (do_getc_escaped): Fix handling of \x and \u.
+       Fix handling of \u escape sequences in Tcl.
+       * x-tcl.c (do_getc_escaped): Fix handling of \u.
        Reported by Guido Berhoerster in
        <https://lists.gnu.org/archive/html/bug-gettext/2013-06/msg00022.html>.
 

diff --git a/gettext-tools/src/x-tcl.c b/gettext-tools/src/x-tcl.c
index 2b57e3f1c7b9a1d288dce0c4a8dc7635ffe85d2b..37dd19ec16c9383db89010f19935915a69d9bc86 100644 (file)
--- a/gettext-tools/src/x-tcl.c
+++ b/gettext-tools/src/x-tcl.c
@@ -496,10 +496,7 @@ do_getc_escaped ()
           {
             c = phase1_getc ();
             if (c == EOF || !c_isxdigit ((unsigned char) c))
-              {
-                phase1_ungetc (c);
-                break;
-              }
+              break;
 
             if (c >= '0' && c <= '9')
               n = (n << 4) + (c - '0');
@@ -508,6 +505,7 @@ do_getc_escaped ()
             else if (c >= 'a' && c <= 'f')
               n = (n << 4) + (c - 'a' + 10);
           }
+        phase1_ungetc (c);
         return (i > 0 ? (unsigned char) n : 'x');
       }
     case 'u':

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index f036e07b6e56126c883f250c0f8dbf9ef569ef6d..12e4c78133dcec83456dd1a417101377747c5d65 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,6 +1,6 @@
 2013-06-25  Daiki Ueno  <ueno@gnu.org>
 
-       Fix handling of \x and \u escape sequences in Tcl.
+       Fix handling of \u escape sequences in Tcl.
        * Makefile.am (TESTS): Add xgettext-tcl-4.
        * xgettext-tcl-4: New test for escape sequences.