diff options
author | Michael Albinus <michael.albinus@gmx.de> | 2013-02-25 09:29:59 +0100 |
---|---|---|
committer | Michael Albinus <michael.albinus@gmx.de> | 2013-02-25 09:29:59 +0100 |
commit | db19bba331efadd37cec1298be2c28f0742a7379 (patch) | |
tree | 571a249be013d3f644bbb64560bb3348a68f2d05 /doc | |
parent | c0c2eb8295bb99b6ac0bbf8c1e06b60220074a5b (diff) | |
download | emacs-db19bba331efadd37cec1298be2c28f0742a7379.tar.gz |
* tramp.texi (top) [xxx, yyy, trampfn]: Provide two versions of
the macros, for Texinfo 4.13 and 5.0.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/misc/ChangeLog | 5 | ||||
-rw-r--r-- | doc/misc/tramp.texi | 26 |
2 files changed, 31 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 63cbcdc5a15..fab7a301094 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2013-02-25 Michael Albinus <michael.albinus@gmx.de> + + * tramp.texi (top) [xxx, yyy, trampfn]: Provide two versions of + the macros, for Texinfo 4.13 and 5.0. + 2013-02-24 Michael Albinus <michael.albinus@gmx.de> Port documentation to Texinfo 5.0. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 493c69da052..c65d4aac7ed 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -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. +@c There are subtle differences between texinfo 4.13 and 5.0. We must +@c declare two versions of the macro. This will be improved, hopefully. + +@c Texinfo 5.0. +@ifset txicommandconditionals @macro xxx {one} @set \one\ @end macro @@ -38,6 +43,26 @@ @yyy{\user\,@@}@c \host\@value{postfix}\localname\ @end macro +@end ifset + +@c Texinfo 4.13. +@ifclear txicommandconditionals +@macro xxx {one}@c +@set \one\@c +@end macro + +@macro yyy {one, two}@c +@xxx{x\one\}@c +@ifclear x@c +\one\@w{}\two\@c +@end ifclear +@clear x\one\@c +@end macro + +@macro trampfn {method, user, host, localname}@c +@value{prefix}@yyy{\method\,@value{postfixhop}}@yyy{\user\,@@}\host\@value{postfix}\localname\@c +@end macro +@end ifclear @copying Copyright @copyright{} 1999--2013 Free Software Foundation, Inc. @@ -3849,3 +3874,4 @@ for @value{emacsothername}. @c * Use `filename' resp. `file name' consistently. @c * Use `host' resp. `machine' consistently. @c * Consistent small or capitalized words especially in menus. +@c * Make a unique declaration of @trampfn. |