[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111298: * tramp.texi (top) [xxx, yyy, trampfn]: Provide two versions of

[Michael Albinus]

------------------------------------------------------------
revno: 111298
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Mon 2013-02-25 09:29:59 +0100
message:
  * tramp.texi (top) [xxx, yyy, trampfn]: Provide two versions of
  the macros, for Texinfo 4.13 and 5.0.
modified:
  doc/misc/ChangeLog
  doc/misc/tramp.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-02-24 17:58:55 +0000
+++ b/doc/misc/ChangeLog        2013-02-25 08:29:59 +0000
@@ -1,3 +1,8 @@
+2013-02-25  Michael Albinus  <address@hidden>
+
+       * tramp.texi (top) [xxx, yyy, trampfn]: Provide two versions of
+       the macros, for Texinfo 4.13 and 5.0.
+
 2013-02-24  Michael Albinus  <address@hidden>
 
        Port documentation to Texinfo 5.0.

=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi       2013-02-24 17:58:29 +0000
+++ b/doc/misc/tramp.texi       2013-02-25 08:29:59 +0000
@@ -20,6 +20,11 @@
 @c xxx and yyy are auxiliary macros in order to omit leading and
 @c trailing whitespace.  Not very elegant, but I don't know it better.
 
address@hidden There are subtle differences between texinfo 4.13 and 5.0.  We 
must
address@hidden declare two versions of the macro.  This will be improved, 
hopefully.
+
address@hidden Texinfo 5.0.
address@hidden txicommandconditionals
 @macro xxx {one}
 @set \one\
 @end macro
@@ -38,6 +43,26 @@
 @yyy{\user\,@@address@hidden
 address@hidden
 @end macro
address@hidden ifset
+
address@hidden Texinfo 4.13.
address@hidden txicommandconditionals
address@hidden xxx address@hidden
address@hidden address@hidden
address@hidden macro
+
address@hidden yyy {one, address@hidden
address@hidden@c
address@hidden address@hidden
address@hidden@c
address@hidden ifclear
address@hidden address@hidden
address@hidden macro
+
address@hidden trampfn {method, user, host, address@hidden
address@hidden@yyy{\method\,@address@hidden,@@address@hidden@c
address@hidden macro
address@hidden ifclear
 
 @copying
 Copyright @copyright{} 1999--2013 Free Software Foundation, Inc.
@@ -3849,3 +3874,4 @@
 @c * Use `filename' resp. `file name' consistently.
 @c * Use `host' resp. `machine' consistently.
 @c * Consistent small or capitalized words especially in menus.
address@hidden * Make a unique declaration of @trampfn.