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.

8 files changed, 24 insertions, 22 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9948ec0d3c0..12f5f5fb84c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,20 @@
 2014-08-07  Reuben Thomas  <rrt@sc3d.org>
 
+        * progmodes/ada-mode.el:
+        * net/tramp.el (tramp-handle-file-symlink-p):
+        * net/tramp-ftp.el (tramp-ftp-file-name-handler): Remove a comment
+        about VMS, which we no longer support.
+        * 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.
+
+2014-08-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.el (auto-mode-alist): Remove support for VMS from a
+        pattern.
+
+2014-08-07  Reuben Thomas  <rrt@sc3d.org>
+
         Refer to MS-DOS using the same name everywhere.
 
         * arc-mode.el: Fix a couple of ``MS-DOG''s missed in the previous
diff --git a/lisp/files.el b/lisp/files.el
index 597afb99120..5cff5b11ee9 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2413,7 +2413,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode)
      ("\\.wy\\'" . wisent-grammar-mode)
      ;; .emacs or .gnus or .viper following a directory delimiter in
      ;; Unix or MS-DOS syntax.
-     ("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode)
+     ("[:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode)
      ("\\`\\..*emacs\\'" . emacs-lisp-mode)
      ;; _emacs following a directory delimiter in MS-DOS syntax
      ("[:/]_emacs\\'" . emacs-lisp-mode)
diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el
index d98f6d74a6a..a723e57f296 100644
--- a/lisp/net/tramp-ftp.el
+++ b/lisp/net/tramp-ftp.el
@@ -178,12 +178,7 @@ pass to the OPERATION."
             (ignore-errors (delete-file tmpfile)))))
 
        ;; Normally, the handlers must be discarded.
-       ;; `inhibit-file-name-handlers' isn't sufficient, because the
-       ;; local file name could be in Tramp syntax as well (for
-       ;; example, returning VMS file names like "/DISK$CAM:/AAA").
-       ;; That's why we set also `tramp-mode' to nil.
-       (t (let* (;(tramp-mode nil)
-                 (inhibit-file-name-handlers
+       (t (let* ((inhibit-file-name-handlers
                   (list 'tramp-file-name-handler
                         'tramp-completion-file-name-handler
                         (and (eq inhibit-file-name-operation operation)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 921c70135df..17259c69159 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2998,8 +2998,6 @@ User is always nil."
   (with-parsed-tramp-file-name filename nil
     (let ((x (car (file-attributes filename))))
       (when (stringp x)
-        ;; When Tramp is running on VMS, then `file-name-absolute-p'
-        ;; might do weird things.
         (if (file-name-absolute-p x)
             (tramp-make-tramp-file-name method user host x)
           x)))))
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 68b6c872d3f..0d07d573155 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -31,11 +31,6 @@
 ;; independent from the GNU Ada compiler GNAT, distributed by Ada
 ;; Core Technologies.  All the other files rely heavily on features
 ;; provided only by GNAT.
-;;
-;; Note: this mode will not work with Emacs 19. If you are on a VMS
-;; system, where the latest version of Emacs is 19.28, you will need
-;; another file, called ada-vms.el, that provides some required
-;; functions.
 
 ;;; Usage:
 ;; Emacs should enter Ada mode automatically when you load an Ada file.
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 7cad848fda8..4bc37451e6e 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -651,12 +651,6 @@ Call `ada-require-project-file' first to ensure a project exists."
         (find-file (car (cdr pos)))
         (goto-char (car pos)))))
 
-(defun ada-convert-file-name (name)
-  "Convert from NAME to a name that can be used by the compilation commands.
-This is overridden on VMS to convert from VMS filenames to Unix filenames."
-  name)
-;; FIXME: use convert-standard-filename instead
-
 (defun ada-set-default-project-file (file)
   "Set FILE as the current project file."
   (interactive "fProject file:")
@@ -1465,7 +1459,7 @@ by replacing the file extension with `.ali'."
            (get-file-buffer ali-file-name))
       (kill-buffer (get-file-buffer ali-file-name)))
 
-  (let* ((name      (ada-convert-file-name file))
+  (let* ((name      (convert-standard-filename file))
          (body-name (or (ada-get-body-name name) name)))
 
     ;; Always recompile the body when we can.  We thus temporarily switch to a
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 92945b37951..9554c6e519c 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-07  Reuben Thomas  <rrt@sc3d.org>
+
+        * url-handlers.el: Remove a comment about VMS, which we no longer
+        support.
+
 2014-08-03  Paul Eggert  <eggert@cs.ucla.edu>
 
         Don't mishandle dates in the year 9999 (Bug#18176).
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 704c743bfcd..6b7ab8c9ce6 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -51,7 +51,7 @@
 ;; delete-directory                     Finished (DAV)
 ;; delete-file                          Finished (DAV)
 ;; diff-latest-backup-file
-;; directory-file-name                  unnecessary (what about VMS)?
+;; directory-file-name                  unnecessary
 ;; directory-files                      Finished (DAV)
 ;; dired-call-process
 ;; dired-compress-file