aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorReuben Thomas2014-08-07 12:49:36 +0100
committerReuben Thomas2014-08-07 12:49:36 +0100
commit6d9d9cde2f7672efc5d74dc1f8f4a8bd9deb27ea (patch)
tree5617810b2e5630ce6a5bef0b8dffa300e3ff19b9 /doc/misc
parent6c5bbf8a00919b191d5319ee9324c93f1c496dbf (diff)
downloademacs-6d9d9cde2f7672efc5d74dc1f8f4a8bd9deb27ea.tar.gz
emacs-6d9d9cde2f7672efc5d74dc1f8f4a8bd9deb27ea.zip
Remove remaining mentions of VMS as a host
* notes/exit-value: Remove specific discussion of VMS. * doc/emacs/programs.texi (Program Modes): Don't advertise VMS DCL support any more. * doc/misc/ediff.texi (Merging and diff3): Don't mention lack of support for VMS diff, we no longer support VMS. * lisp/progmodes/ada-mode.el: * lisp/net/tramp.el (tramp-handle-file-symlink-p): * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Remove a comment about VMS, which we no longer support. * lisp/progmodes/ada-xref.el (ada-xref-current): Remove mention of VMS, and fix a FIXME, using convert-standard-filename in place of removed ada-convert-file-name. * lisp/url/url-handlers.el: Remove a comment about VMS, which we no longer support.
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/ediff.texi8
2 files changed, 6 insertions, 7 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 8f50396b2b8..cc0da7e25f3 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
12014-08-07 Reuben Thomas <rrt@sc3d.org>
2
3 * ediff.texi (Merging and diff3): Don't mention lack of support
4 for VMS diff, we no longer support VMS.
5
12014-08-07 Michael Albinus <michael.albinus@gmx.de> 62014-08-07 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * tramp.texi (Remote shell setup): Explain, how to change command 8 * tramp.texi (Remote shell setup): Explain, how to change command
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 9d373982fa8..4e1806de94d 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -350,8 +350,7 @@ All the above functions use the POSIX @code{diff} or @code{diff3} programs
350to find differences between two files. They process the @code{diff} output 350to find differences between two files. They process the @code{diff} output
351and display it in a convenient form. At present, Ediff understands only 351and display it in a convenient form. At present, Ediff understands only
352the plain output from diff. Options such as @samp{-c} are not supported, 352the plain output from diff. Options such as @samp{-c} are not supported,
353nor is the format produced by incompatible file comparison programs such as 353nor is the format produced by incompatible file comparison programs.
354the VMS version of @code{diff}.
355 354
356The functions @code{ediff-files}, @code{ediff-buffers}, 355The functions @code{ediff-files}, @code{ediff-buffers},
357@code{ediff-files3}, @code{ediff-buffers3} first display the coarse, 356@code{ediff-files3}, @code{ediff-buffers3} first display the coarse,
@@ -1945,11 +1944,6 @@ Specifies the default directory to look for patches.
1945 1944
1946@end table 1945@end table
1947 1946
1948@noindent
1949@strong{Warning:} Ediff does not support the output format of VMS
1950@code{diff}. Instead, make sure you are using some implementation of POSIX
1951@code{diff}, such as @code{gnudiff}.
1952
1953@node Merging and diff3 1947@node Merging and diff3
1954@section Merging and diff3 1948@section Merging and diff3
1955 1949