work around regression in texinfo 6.0

Signed-off-by: Mattias Andrée <maandree@operamail.com>

3 files changed, 11 insertions, 13 deletions

diff --git a/doc/info/chap/error-reporting.texinfo b/doc/info/chap/error-reporting.texinfo
index 7bb39db..4d44a31 100644
--- a/doc/info/chap/error-reporting.texinfo
+++ b/doc/info/chap/error-reporting.texinfo
@@ -578,11 +578,11 @@ A more scalable example:
     if (FAILABLE_CALL(call_and_check)) \
       goto fail; \
   @} while (0)
-/* @w{@xtext{`@xcode{try}` or simply `@xcode{t}` may be even better.}} */
+/* @w{@xrm{}`@xtt{}try@xrm{}` or simply `@xtt{}t@xrm{}` may be even better.@xtt{}} */
 
 #define fail_unless (call_and_check)  \
   fail_if(!(call_and_check))
-/* @w{@xtext{`@xcode{f}` may be even better.}} */
+/* @w{@xrm{}`@xtt{}f@xrm{}` may be even better.@xtt{}} */
 
 int my_function(void)
 @{
@@ -590,7 +590,7 @@ int my_function(void)
   void* array;
   /* ... */
   fail_if (!(array = malloc(n)));
-  /* @w{@xtext{or perhaps, @xcode{fail_unless (array = malloc(n));}}} */
+  /* @w{@xrm{}or perhaps, `@xtt{}fail_unless (array = malloc(n));@xrm{}`@xtt{}} */
   /* ... */
   return 0;
 
@@ -629,7 +629,7 @@ int my_function(void)
       if (FAILURE_CHECK(r < 0, 1))
         @{
           if (errno != EINTR)
-            /* @w{@xtext{Or @xcode{FAILURE_CHECK(errno != EINTR, 3)}.}} */
+            /* @w{@xrm{}Or `@xtt{}FAILURE_CHECK(errno != EINTR, 3)@xrm{}`.@xtt{}} */
             goto fail;
           continue;
         @}
diff --git a/doc/info/chap/memory-allocation.texinfo b/doc/info/chap/memory-allocation.texinfo
index 66c0067..0ef4982 100644
--- a/doc/info/chap/memory-allocation.texinfo
+++ b/doc/info/chap/memory-allocation.texinfo
@@ -867,7 +867,7 @@ size_t psize, new_size;
   if (p == NULL)
     @{
       p = old;
-      goto fail; /* @w{@xtext{Where @xcode{p} is cleaned up.}} */
+      goto fail; /* @w{@xrm{}Where `@xtt{}p@xrm{}` is cleaned up.@xtt{}} */
     @}
   psize = new_size;
 @}
diff --git a/doc/info/macros.texinfo b/doc/info/macros.texinfo
index da74599..1798d76 100644
--- a/doc/info/macros.texinfo
+++ b/doc/info/macros.texinfo
@@ -10,24 +10,22 @@
 @end ifnottex
 
 @iftex
-@macro xcode{a}
-@code{\a\}
+@macro xrm{}
+@rm{}
 @end macro
 @end iftex
 @ifnottex
-@macro xcode{a}
-\a\
+@macro xrm{}
 @end macro
 @end ifnottex
 
 @iftex
-@macro xtext{a}
-@rm{}\a\@tt{}
+@macro xtt{}
+@tt{}
 @end macro
 @end iftex
 @ifnottex
-@macro xtext{a}
-\a\
+@macro xtt{}
 @end macro
 @end ifnottex