diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2016-01-31 13:50:23 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2016-01-31 13:50:23 +0100 |
| commit | 0156b79ea8fd473c550abdb8d3e3b4eacaaab289 (patch) | |
| tree | 3d5d0fecf83c134216231e8bb4cce63ff9b263b1 /doc/misc/Makefile.in | |
| parent | 802e6df70b588ae37ebebfffbdbd9d80ec3a9e60 (diff) | |
| download | emacs-0156b79ea8fd473c550abdb8d3e3b4eacaaab289.tar.gz | |
Merge changes from Tramp repository
* doc/misc/Makefile.in (${buildinfodir}/tramp.info tramp.html):
No EXTRA_OPTS needed.
* doc/misc/tramp.texi: Merge changes from Emacsemacs-25
branch, especially for @trampfn{}.
(Top): Move @ifnottex down.
(History): XEmacs support has been removed.
(GVFS based methods, Remote processes): Do not use emacsgvfs flag.
(Auto-save and Backup): Use both syntax versions.
(File name Syntax): Remark on IPv6 adresses is valid for
unified syntax only.
* doc/misc/trampver.texi: Do not set emacsgvfs flag.
Diffstat (limited to 'doc/misc/Makefile.in')
| -rw-r--r-- | doc/misc/Makefile.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 4dffeafb1d2..eca74a0c645 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -218,7 +218,6 @@ gnus.pdf: $(gnus_deps) cp gnustmppdf.pdf $@ rm gnustmppdf.* -${buildinfodir}/tramp.info tramp.html: EXTRA_OPTS = -D emacs ${buildinfodir}/tramp.info tramp.html: ${srcdir}/trampver.texi |