* bitmaps/README:

* xfns.c:
* termcap.c:
* term.c:
* syswait.h:
* systty.h:
* systime.h:
* syssignal.h:
* sysdep.c:
* process.h:
* process.c:
* print.c:
* ndir.h:
* lread.c:
* keyboard.c:
* getpagesize.h:
* floatfns.c:
* fileio.c:
* emacs.c:
* doc.c:
* dispnew.c:
* dired.c:
* data.c:
* callproc.c:
* buffer.c:
* README:
* Makefile.in:
* s/template.h:
* s/msdos.h:
* m/vax.h: Remove VMS support.
* s/vms.h:
* vlimit.h:
* uaf.h:
* temacs.opt:
* param.h:
* ioctl.h: Remove file.

* descrip.mms:
* compile.com: Remove file.
* Create.c: Remove VMS support.

* message.el (Module):

* gnus-start.el (Module):

* gnus-registry.el (Module):

* textmodes/texinfmt.el:
* nxml/nxml-enc.el:
* mail/feedmail.el:
* international/mule.el:
* international/latexenc.el:
* emulation/viper-util.el:
* emulation/viper-init.el:
* emulation/viper-ex.el:
* emacs-lisp/bytecomp.el:
* version.el:
* subr.el:
* startup.el:
* sort.el:
* shadowfile.el:
* recentf.el:
* printing.el:
* paths.el:
* minibuffer.el:
* ls-lisp.el:
* loadup.el:
* hippie-exp.el:
* finder.el:
* files.el:
* ediff-util.el:
* ediff-ptch.el:
* ediff-init.el:
* ediff-diff.el:
* dired.el:
* dired-aux.el:
* cus-edit.el:
* bindings.el:
* arc-mode.el:
* add-log.el: Remove VMS support.
* obsolete/vmsproc.el:
* obsolete/vms-pmail.el:
* obsolete/vms-patch.el: Remove file.

* etags.c:
* emacsclient.c: Remove VMS support.

* termcap.src: Remove file.
* README:
* PROBLEMS:
* MACHINES: Remove VMS info.

* ediff.texi: Remove VMS support.

* os.texi:
* intro.texi:
* files.texi: Remove VMS support.

* emacs.texi: Remove VMS support.

* make-dist:
* README: Remove VMS support.
* vms: Remove directory.

40 files changed, 124 insertions, 813 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 893c919df4b..9bf7870786d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,42 @@
+2008-07-31  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* textmodes/texinfmt.el:
+	* nxml/nxml-enc.el:
+	* mail/feedmail.el:
+	* international/mule.el:
+	* international/latexenc.el:
+	* emulation/viper-util.el:
+	* emulation/viper-init.el:
+	* emulation/viper-ex.el:
+	* emacs-lisp/bytecomp.el:
+	* version.el:
+	* subr.el:
+	* startup.el:
+	* sort.el:
+	* shadowfile.el:
+	* recentf.el:
+	* printing.el:
+	* paths.el:
+	* minibuffer.el:
+	* ls-lisp.el:
+	* loadup.el:
+	* hippie-exp.el:
+	* finder.el:
+	* files.el:
+	* ediff-util.el:
+	* ediff-ptch.el:
+	* ediff-init.el:
+	* ediff-diff.el:
+	* dired.el:
+	* dired-aux.el:
+	* cus-edit.el:
+	* bindings.el:
+	* arc-mode.el:
+	* add-log.el: Remove VMS support.
+	* obsolete/vmsproc.el:
+	* obsolete/vms-pmail.el:
+	* obsolete/vms-patch.el: Remove file.
+
 2008-07-31  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-mode.el (c-before-hack-hook): New function
diff --git a/lisp/add-log.el b/lisp/add-log.el
index e344c0f5dd1..d0a21e8286e 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -556,9 +556,7 @@ If t, use universal time.")
 (defun change-log-name ()
   "Return (system-dependent) default name for a change log file."
   (or change-log-default-name
-      (if (eq system-type 'vax-vms)
-	  "$CHANGE_LOG$.TXT"
-	"ChangeLog")))
+      "ChangeLog"))
 
 (defun add-log-edit-prev-comment (arg)
   "Cycle backward through Log-Edit mode comment history.
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 83ffe65c970..ddbedeba12c 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -1731,7 +1731,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
 			 str archive-file-name-coding-system)))
 	     (isdir   (and (= ucsize 0)
 			   (string= (file-name-nondirectory efnname) "")))
-	     (mode    (cond ((memq creator '(2 3)) ; Unix + VMS
+	     (mode    (cond ((memq creator '(2 3)) ; Unix
 			     (archive-l-e (+ p 40) 2))
 			    ((memq creator '(0 5 6 7 10 11 15)) ; Dos etc.
 			     (logior ?\444
@@ -1800,7 +1800,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
 	       (oldmode (aref fil 3))
 	       (newval  (archive-calc-mode oldmode newmode t))
 	       (inhibit-read-only t))
-	  (cond ((memq creator '(2 3)) ; Unix + VMS
+	  (cond ((memq creator '(2 3)) ; Unix
 		 (goto-char (+ p 40))
 		 (delete-char 2)
 		 (insert-unibyte (logand newval 255) (lsh newval -8)))
diff --git a/lisp/bindings.el b/lisp/bindings.el
index c09e56ae9a2..559c3a35751 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -583,10 +583,6 @@ is okay.  See `mode-line-format'.")
        (cond ((memq system-type '(ms-dos windows-nt))
 	      '(".o" "~" ".bin" ".bak" ".obj" ".map" ".ico" ".pif" ".lnk"
 		".a" ".ln" ".blg" ".bbl" ".dll" ".drv" ".vxd" ".386"))
-	     ((eq system-type 'vax-vms)
-	      '(".obj" ".exe" ".bin" ".lbin" ".sbin"
-		".brn" ".rnt" ".lni"
-		".olb" ".tlb" ".mlb" ".hlb"))
 	     (t
 	      '(".o" "~" ".bin" ".lbin" ".so"
 		".a" ".ln" ".blg" ".bbl")))
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 80a6ee5ad9c..e39a50f3a8e 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -292,10 +292,6 @@
   "Front-ends/assistants for, or emulators of, UNIX features."
   :group 'environment)
 
-(defgroup vms nil
-  "Support code for vms."
-  :group 'environment)
-
 (defgroup i18n nil
   "Internationalization and alternate character-set support."
   :link '(custom-manual "(emacs)International")
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 0d351243548..5feed9b2191 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1108,7 +1108,6 @@ See Info node `(emacs)Subdir switches' for more details."
   ;; or wildcard lines.
   ;; Important: never moves into the next subdir.
   ;; DIR is assumed to be unhidden.
-  ;; Will probably be redefined for VMS etc.
   (save-excursion
     (or (dired-goto-subdir dir) (error "This cannot happen"))
     (forward-line 1)
@@ -1936,7 +1935,6 @@ This function takes some pains to conform to `ls -lR' output."
     (save-excursion (dired-mark-remembered mark-alist))
     (restore-buffer-modified-p modflag)))
 
-;; This is a separate function for dired-vms.
 (defun dired-insert-subdir-validate (dirname &optional switches)
   ;; Check that it is valid to insert DIRNAME with SWITCHES.
   ;; Signal an error if invalid (e.g. user typed `i' on `..').
diff --git a/lisp/dired.el b/lisp/dired.el
index afa06d11edd..06a11a6b478 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -719,7 +719,6 @@ for a remote directory.  This feature is used by Auto Revert Mode."
 	 (file-readable-p dirname)
 	 (dired-directory-changed-p dirname))))
 
-;; Separate function from dired-noselect for the sake of dired-vms.el.
 (defun dired-internal-noselect (dir-or-list &optional switches mode)
   ;; If there is an existing dired buffer for DIRNAME, just leave
   ;; buffer as it is (don't even call dired-revert).
@@ -1987,8 +1986,7 @@ Optional arg GLOBAL means to replace all matches."
   ;;"Convert FILE (a file name relative to DIR) to an absolute file name."
   ;; We can't always use expand-file-name as this would get rid of `.'
   ;; or expand in / instead default-directory if DIR=="".
-  ;; This should be good enough for ange-ftp, but might easily be
-  ;; redefined (for VMS?).
+  ;; This should be good enough for ange-ftp.
   ;; It should be reasonably fast, though, as it is called in
   ;; dired-get-filename.
   (concat (or dir default-directory) file))
@@ -2554,7 +2552,7 @@ non-empty directories is allowed."
 (defun dired-internal-do-deletions (l arg)
   ;; L is an alist of files to delete, with their buffer positions.
   ;; ARG is the prefix arg.
-  ;; Filenames are absolute (VMS needs this for logical search paths).
+  ;; Filenames are absolute.
   ;; (car L) *must* be the *last* (bottommost) file in the dired buffer.
   ;; That way as changes are made in the buffer they do not shift the
   ;; lines still to be changed, so the (point) values in L stay valid.
@@ -3442,9 +3440,6 @@ Ask means pop up a menu for the user to select one of copy, move or link."
 	     '(dired-mode . dired-restore-desktop-buffer))
 
 
-(if (eq system-type 'vax-vms)
-    (load "dired-vms"))
-
 (provide 'dired)
 
 (run-hooks 'dired-load-hook)		; for your customizations
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 842be4787d3..ec9bf24c493 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -56,7 +56,6 @@ Must produce output compatible with Unix's diff3 program."
   (cond ((eq system-type 'emx) "cmd") ; OS/2
 	((memq system-type '(ms-dos windows-nt windows-95))
 	 shell-file-name) ; no standard name on MS-DOS
-	((memq system-type '(vax-vms axp-vms)) "*dcl*") ; VMS
 	(t  "sh")) ; UNIX
   "*The shell used to run diff and patch.
 If user's .profile or .cshrc files are set up correctly, any shell
@@ -336,9 +335,7 @@ one optional arguments, diff-number to refine.")
     (erase-buffer)
     (insert (ediff-with-current-buffer diff-buff (buffer-string)))
     (goto-char (point-min))
-    (delete-matching-lines ok-regexp)
-    (if (memq system-type '(vax-vms axp-vms))
-	(delete-matching-lines "^$")))
+    (delete-matching-lines ok-regexp))
   ;; If diff reports errors, show them then quit.
   (if (/= 0 (ediff-with-current-buffer ediff-error-buffer (buffer-size)))
       (let ((ctl-buf ediff-control-buffer)
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index ba9aeecffcc..a3dd91b2fce 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -1400,8 +1400,6 @@ Instead, C-h would jump to previous difference."
 ;;;  (file-name-as-directory
 ;;;   (cond ((memq system-type '(ms-dos windows-nt))
 ;;;	  (or (getenv "TEMP") (getenv "TMPDIR") (getenv "TMP") "c:/temp"))
-;;;	 ((memq system-type '(vax-vms axp-vms))
-;;;	  (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "SYS$SCRATCH:"))
 ;;;	 (t
 ;;;	  (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "/tmp"))))
   "*Prefix to put on Ediff temporary file names.
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index 2135982e67d..ce6e88611be 100644
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@@ -61,7 +61,7 @@ case the default value for this variable should be changed."
 
 ;; the default backup extension
 (defconst ediff-default-backup-extension
-  (if (memq system-type '(vax-vms axp-vms emx ms-dos))
+  (if (memq system-type '(emx ms-dos))
       "_orig" ".orig"))
 
 
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 9aef531b39a..8705c243d34 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -3217,7 +3217,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
 ;; Quote metacharacters (using \) when executing diff in Unix, but not in
 ;; EMX OS/2
 ;;(defun ediff-protect-metachars (str)
-;;  (or (memq system-type '(emx vax-vms axp-vms))
+;;  (or (memq system-type '(emx))
 ;;      (let ((limit 0))
 ;;	(while (string-match ediff-metachars str limit)
 ;;	  (setq str (concat (substring str 0 (match-beginning 0))
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 5bb2d760980..3de90acf8af 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -197,9 +197,7 @@
   "Emacs Lisp byte-compiler."
   :group 'lisp)
 
-(defcustom emacs-lisp-file-regexp (if (eq system-type 'vax-vms)
-				      "\\.EL\\(;[0-9]+\\)?$"
-				    "\\.el$")
+(defcustom emacs-lisp-file-regexp "\\.el$"
   "*Regexp which matches Emacs Lisp source files.
 You may want to redefine the function `byte-compile-dest-file'
 if you change this variable."
@@ -225,9 +223,7 @@ If FILENAME matches `emacs-lisp-file-regexp' (by default, files
 with the extension `.el'), add `c' to it; otherwise add `.elc'."
       (setq filename (byte-compiler-base-file-name filename))
       (setq filename (file-name-sans-versions filename))
-      (cond ((eq system-type 'vax-vms)
-	     (concat (substring filename 0 (string-match ";" filename)) "c"))
-	    ((string-match emacs-lisp-file-regexp filename)
+      (cond ((string-match emacs-lisp-file-regexp filename)
 	     (concat (substring filename 0 (match-beginning 0)) ".elc"))
 	    (t (concat filename ".elc")))))
 
@@ -1788,7 +1784,6 @@ The value is non-nil if there were no errors, nil if errors."
 	(with-current-buffer output-buffer
 	  (goto-char (point-max))
 	  (insert "\n")			; aaah, unix.
-	  (let ((vms-stmlf-recfm t))
 	    (if (file-writable-p target-file)
 		;; We must disable any code conversion here.
 		(let ((coding-system-for-write 'no-conversion))
@@ -1808,7 +1803,7 @@ The value is non-nil if there were no errors, nil if errors."
 			    (if (file-exists-p target-file)
 				"cannot overwrite file"
 			      "directory not writable or nonexistent")
-			    target-file))))
+			    target-file)))
 	  (kill-buffer (current-buffer)))
 	(if (and byte-compile-generate-call-tree
 		 (or (eq t byte-compile-generate-call-tree)
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index b89b321a1fd..75bdadd2d61 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -331,12 +331,11 @@ Don't put `-c' here, as it is added automatically."
   (cond (ex-unix-type-shell 'viper-glob-unix-files)
 	((eq system-type 'emx) 'viper-glob-mswindows-files) ; OS/2
 	(viper-ms-style-os-p 'viper-glob-mswindows-files) ; Microsoft OS
-	(viper-vms-os-p 'viper-glob-unix-files) ; VMS
 	(t  'viper-glob-unix-files) ; presumably UNIX
 	)
   "Expand the file spec containing wildcard symbols.
 The default tries to set this variable to work with Unix, Windows,
-OS/2, and VMS.
+and OS/2.
 
 However, if it doesn't work right for some types of Unix shells or some OS,
 the user should supply the appropriate function and set this variable to the
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index d1533b3a311..d8eaf253d16 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -69,11 +69,6 @@
   :type 'boolean
   :tag "Is it Microsoft-made OS?"
   :group 'viper-misc)
-(defcustom viper-vms-os-p (memq system-type '(vax-vms axp-vms))
-  "Tells if Emacs is running under VMS."
-  :type 'boolean
-  :tag "Is it VMS?"
-  :group 'viper-misc)
 
 (defcustom viper-suppress-input-method-change-message nil
   "If t, the message notifying about changes in the input method is not displayed.
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index d5e63dd9983..9bb047183dc 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -397,11 +397,10 @@ Otherwise return the normal value."
 ;;; Support for :e, :r, :w file globbing
 
 ;; Glob the file spec.
-;; This function is designed to work under Unix.  It might also work under VMS.
+;; This function is designed to work under Unix.
 (defun viper-glob-unix-files (filespec)
   (let ((gshell
 	 (cond (ex-unix-type-shell shell-file-name)
-	       ((memq system-type '(vax-vms axp-vms)) "*dcl*") ; VAX VMS
 	       (t "sh"))) ; probably Unix anyway
 	(gshell-options
 	 ;; using cond in anticipation of further additions
diff --git a/lisp/files.el b/lisp/files.el
index a26e5cb83cd..1a18a1d1b17 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -70,8 +70,7 @@ the name it is linked to."
   :group 'abbrev
   :group 'find-file)
 
-;; Turn off backup files on VMS since it has version numbers.
-(defcustom make-backup-files (not (eq system-type 'vax-vms))
+(defcustom make-backup-files t
   "Non-nil means make a backup of a file the first time it is saved.
 This can be done by renaming the file or by copying.
 
@@ -190,8 +189,6 @@ If the buffer is visiting a new file, the value is nil.")
   (file-name-as-directory
    (cond ((memq system-type '(ms-dos windows-nt))
 	  (or (getenv "TEMP") (getenv "TMPDIR") (getenv "TMP") "c:/temp"))
-	 ((memq system-type '(vax-vms axp-vms))
-	  (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "SYS$SCRATCH:"))
 	 (t
 	  (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "/tmp"))))
   "The directory for writing temporary files."
@@ -216,7 +213,6 @@ have fast storage with limited space, such as a RAM disk."
 (declare-function dired-unmark "dired" (arg))
 (declare-function dired-do-flagged-delete "dired" (&optional nomessage))
 (declare-function dos-8+3-filename "dos-fns" (filename))
-(declare-function vms-read-directory "vms-patch" (dirname switches buffer))
 (declare-function view-mode-disable "view" ())
 
 (defvar file-name-invalid-regexp
@@ -625,8 +621,7 @@ Directories are separated by occurrences of `path-separator'
   "Change current directory to given absolute file name DIR."
   ;; Put the name into directory syntax now,
   ;; because otherwise expand-file-name may give some bad results.
-  (if (not (eq system-type 'vax-vms))
-      (setq dir (file-name-as-directory dir)))
+  (setq dir (file-name-as-directory dir))
   (setq dir (abbreviate-file-name (expand-file-name dir)))
   (if (not (file-directory-p dir))
       (if (file-exists-p dir)
@@ -1461,11 +1456,7 @@ home directory is a root directory) and removes automounter prefixes
       filename)))
 
 (defcustom find-file-not-true-dirname-list nil
-  "List of logical names for which visiting shouldn't save the true dirname.
-On VMS, when you visit a file using a logical name that searches a path,
-you may or may not want the visited file name to record the specific
-directory where the file was found.  If you *do not* want that, add the logical
-name to this list as a string."
+  "List of logical names for which visiting shouldn't save the true dirname."
   :type '(repeat (string :tag "Name"))
   :group 'find-file)
 
@@ -1765,15 +1756,6 @@ Do you want to revisit the file normally now? ")
 	(setq buffer-file-truename
 	      (abbreviate-file-name (file-truename buffer-file-name))))
       (setq buffer-file-number number)
-      ;; On VMS, we may want to remember which directory in a search list
-      ;; the file was found in.
-      (and (eq system-type 'vax-vms)
-	   (let (logical)
-	     (if (string-match ":" (file-name-directory filename))
-		 (setq logical (substring (file-name-directory filename)
-					  0 (match-beginning 0))))
-	     (not (member logical find-file-not-true-dirname-list)))
-	   (setq buffer-file-name buffer-file-truename))
       (if find-file-visit-truename
 	  (setq buffer-file-name (expand-file-name buffer-file-truename)))
       ;; Set buffer's default directory to that of the file.
@@ -2412,7 +2394,7 @@ we don't actually set it to the same mode the buffer already has."
 	    (while name
 	      ;; Find first matching alist entry.
 	      (setq mode
-		    (if (memq system-type '(vax-vms windows-nt cygwin))
+		    (if (memq system-type '(windows-nt cygwin))
 			;; System is case-insensitive.
 			(let ((case-fold-search t))
 			  (assoc-default name auto-mode-alist
@@ -3279,8 +3261,6 @@ the old visited file has been renamed to the new name FILENAME."
     (setq buffer-file-name filename)
     (if filename			; make buffer name reflect filename.
 	(let ((new-name (file-name-nondirectory buffer-file-name)))
-	  (if (eq system-type 'vax-vms)
-	      (setq new-name (downcase new-name)))
 	  (setq default-directory (file-name-directory buffer-file-name))
 	  ;; If new-name == old-name, renaming would add a spurious <2>
 	  ;; and it's considered as a feature in rename-buffer.
@@ -3519,22 +3499,11 @@ we do not remove backup version numbers, only true file version numbers."
     (if handler
 	(funcall handler 'file-name-sans-versions name keep-backup-version)
       (substring name 0
-		 (if (eq system-type 'vax-vms)
-		     ;; VMS version number is (a) semicolon, optional
-		     ;; sign, zero or more digits or (b) period, option
-		     ;; sign, zero or more digits, provided this is the
-		     ;; second period encountered outside of the
-		     ;; device/directory part of the file name.
-		     (or (string-match ";[-+]?[0-9]*\\'" name)
-			 (if (string-match "\\.[^]>:]*\\(\\.[-+]?[0-9]*\\)\\'"
-					   name)
-			     (match-beginning 1))
-			 (length name))
-		   (if keep-backup-version
-		       (length name)
-		     (or (string-match "\\.~[-[:alnum:]:#@^._]+~\\'" name)
-			 (string-match "~\\'" name)
-			 (length name))))))))
+		 (if keep-backup-version
+		     (length name)
+		   (or (string-match "\\.~[-[:alnum:]:#@^._]+~\\'" name)
+		       (string-match "~\\'" name)
+		       (length name)))))))
 
 (defun file-ownership-preserved-p (file)
   "Return t if deleting FILE and rewriting it would preserve the owner."
@@ -3737,8 +3706,6 @@ the index in the name where the version number begins."
       (string-to-number (substring fn backup-extract-version-start -1))
       0))
 
-;; I believe there is no need to alter this behavior for VMS;
-;; since backup files are not made on VMS, it should not get called.
 (defun find-backup-file-name (fn)
   "Find a file name for a backup file FN, and suggestions for deletions.
 Value is a list whose car is the name for the backup file
@@ -3984,19 +3951,6 @@ Before and after saving the buffer, this function runs
     (if (buffer-modified-p)
 	(let ((recent-save (recent-auto-save-p))
 	      setmodes)
-	  ;; On VMS, rename file and buffer to get rid of version number.
-	  (if (and (eq system-type 'vax-vms)
-		   (not (string= buffer-file-name
-				 (file-name-sans-versions buffer-file-name))))
-	      (let (buffer-new-name)
-		;; Strip VMS version number before save.
-		(setq buffer-file-name
-		      (file-name-sans-versions buffer-file-name))
-		;; Construct a (unique) buffer name to correspond.
-		(let ((buf (create-file-buffer (downcase buffer-file-name))))
-		  (setq buffer-new-name (buffer-name buf))
-		  (kill-buffer buf))
-		(rename-buffer buffer-new-name)))
 	  ;; If buffer has no file name, ask user for one.
 	  (or buffer-file-name
 	      (let ((filename
@@ -5036,15 +4990,13 @@ by `sh' are supported."
     (concat "\\`" result "\\'")))
 
 (defcustom list-directory-brief-switches
-  (if (eq system-type 'vax-vms) "" "-CF")
+  "-CF"
   "Switches for `list-directory' to pass to `ls' for brief listing."
   :type 'string
   :group 'dired)
 
 (defcustom list-directory-verbose-switches
-  (if (eq system-type 'vax-vms)
-      "/PROTECTION/SIZE/DATE/OWNER/WIDTH=(OWNER:10)"
-    "-l")
+    "-l"
   "Switches for `list-directory' to pass to `ls' for verbose listing."
   :type 'string
   :group 'dired)
@@ -5328,8 +5280,6 @@ normally equivalent short `-D' option is just passed on to
     (if handler
 	(funcall handler 'insert-directory file switches
 		 wildcard full-directory-p)
-      (if (eq system-type 'vax-vms)
-	  (vms-read-directory file switches (current-buffer))
 	(let (result (beg (point)))
 
 	  ;; Read the actual directory using `insert-directory-program'.
@@ -5558,7 +5508,7 @@ normally equivalent short `-D' option is just passed on to
 		      ;; Replace "total" with "used", to avoid confusion.
 		      (replace-match "total used in directory" nil nil nil 1)
 		      (end-of-line)
-		      (insert " available " available)))))))))))
+		      (insert " available " available))))))))))
 
 (defun insert-directory-adj-pos (pos error-lines)
   "Convert `ls --dired' file name position value POS to a buffer position.
@@ -5610,7 +5560,7 @@ With prefix arg, silently save all file-visiting buffers, then kill."
 				(buffer-list))))
 	   (yes-or-no-p "Modified buffers exist; exit anyway? "))
        (or (not (fboundp 'process-list))
-	   ;; process-list is not defined on VMS.
+	   ;; process-list is not defined on MSDOS.
 	   (let ((processes (process-list))
 		 active)
 	     (while processes
diff --git a/lisp/finder.el b/lisp/finder.el
index cb51217192b..e72424a74d3 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -83,8 +83,6 @@
     (tex	. "supporting code for the TeX formatter")
     (tools	. "programming tools")
     (unix	. "front-ends/assistants for, or emulators of, UNIX-like features")
-;; Not a custom group and not currently useful.
-;;    (vms	. "support code for vms")
     (wp		. "word processing")
     ))
 
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 18163fe452f..ba641388939 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -258,9 +258,7 @@ considered precious) will not be trimmed."
 			     (if (and (eq system-type 'ms-dos)
 				      (not (gnus-long-file-names)))
 				 "%s#%d.tm#" ; MSDOS limits files to 8+3
-			       (if (memq system-type '(vax-vms axp-vms))
-				   "%s$tmp$%d"
-				 "%s#tmp#%d"))
+			       "%s#tmp#%d")
 			     working-dir (setq i (1+ i))))
 		      (file-exists-p working-file)))
 
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 1b2458cb89e..f28bc17eccc 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2799,9 +2799,7 @@ If FORCE is non-nil, the .newsrc file is read."
                                    (if (and (eq system-type 'ms-dos)
                                             (not (gnus-long-file-names)))
                                        "%s#%d.tm#" ; MSDOS limits files to 8+3
-                                     (if (memq system-type '(vax-vms axp-vms))
-                                         "%s$tmp$%d"
-                                       "%s#tmp#%d"))
+				     "%s#tmp#%d")
                                    working-dir (setq i (1+ i))))
                             (file-exists-p working-file)))
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index ac4de57a736..181d2f92177 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5296,7 +5296,7 @@ In posting styles use `(\"Expires\" (make-expires-date 30))'."
 	   (* 25 25)))
   (let ((tm (current-time)))
     (concat
-     (if (or (memq system-type '(ms-dos emx vax-vms))
+     (if (or (memq system-type '(ms-dos emx))
 	     ;; message-number-base36 doesn't handle bigints.
 	     (floatp (user-uid)))
 	 (let ((user (downcase (user-login-name))))
@@ -6858,14 +6858,13 @@ header line with the old Message-ID."
   (interactive)
   (let ((file-name (make-auto-save-file-name)))
     (cond ((save-window-excursion
-	     (if (not (eq system-type 'vax-vms))
-		 (with-output-to-temp-buffer "*Directory*"
-		   (with-current-buffer standard-output
-		     (fundamental-mode)) ; for Emacs 20.4+
-		   (buffer-disable-undo standard-output)
-		   (let ((default-directory "/"))
-		     (call-process
-		      "ls" nil standard-output nil "-l" file-name))))
+	     (with-output-to-temp-buffer "*Directory*"
+	       (with-current-buffer standard-output
+		 (fundamental-mode))	; for Emacs 20.4+
+	       (buffer-disable-undo standard-output)
+	       (let ((default-directory "/"))
+		 (call-process
+		  "ls" nil standard-output nil "-l" file-name)))
 	     (yes-or-no-p (format "Recover auto save file %s? " file-name)))
 	   (let ((buffer-read-only nil))
 	     (erase-buffer)
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 69674f508bb..c8722df46b3 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -439,13 +439,13 @@ string).  It returns t if a new completion is found, nil otherwise."
   (if (not old)
       (progn
 	(he-init-string (he-file-name-beg) (point))
-	(let ((name-part (he-file-name-nondirectory he-search-string))
-	      (dir-part (expand-file-name (or (he-file-name-directory
+	(let ((name-part (file-name-nondirectory he-search-string))
+	      (dir-part (expand-file-name (or (file-name-directory
 					       he-search-string) ""))))
 	  (if (not (he-string-member name-part he-tried-table))
 	      (setq he-tried-table (cons name-part he-tried-table)))
 	  (if (and (not (equal he-search-string ""))
-		   (he-file-directory-p dir-part))
+		   (file-directory-p dir-part))
 	      (setq he-expand-list (sort (file-name-all-completions
 					  name-part
 					  dir-part)
@@ -460,7 +460,7 @@ string).  It returns t if a new completion is found, nil otherwise."
 	(if old (he-reset-string))
 	())
       (let ((filename (he-concat-directory-file-name
-		       (he-file-name-directory he-search-string)
+		       (file-name-directory he-search-string)
 		       (car he-expand-list))))
 	(he-substitute-string filename)
 	(setq he-tried-table (cons (car he-expand-list) (cdr he-tried-table)))
@@ -476,11 +476,11 @@ otherwise."
     (if (not old)
 	(progn
 	  (he-init-string (he-file-name-beg) (point))
-	  (let ((name-part (he-file-name-nondirectory he-search-string))
-		(dir-part (expand-file-name (or (he-file-name-directory
+	  (let ((name-part (file-name-nondirectory he-search-string))
+		(dir-part (expand-file-name (or (file-name-directory
 						 he-search-string) ""))))
 	    (if (and (not (equal he-search-string ""))
-		     (he-file-directory-p dir-part))
+		     (file-directory-p dir-part))
 		(setq expansion (file-name-completion name-part
 						      dir-part)))
 	    (if (or (eq expansion t)
@@ -493,16 +493,14 @@ otherwise."
 	  (if old (he-reset-string))
 	  ())
 	(let ((filename (he-concat-directory-file-name
-			 (he-file-name-directory he-search-string)
+			 (file-name-directory he-search-string)
 			 expansion)))
 	  (he-substitute-string filename)
 	  (setq he-tried-table (cons expansion (cdr he-tried-table)))
 	  t))))
 
 (defvar he-file-name-chars
-  (cond ((memq system-type '(vax-vms axp-vms))
-	 "-a-zA-Z0-9_/.,~^#$+=:\\[\\]")
-	((memq system-type '(ms-dos windows-nt cygwin))
+  (cond ((memq system-type '(ms-dos windows-nt cygwin))
 	 "-a-zA-Z0-9_/.,~^#$+=:\\\\")
 	(t			    ;; More strange file formats ?
 	 "-a-zA-Z0-9_/.,~^#$+="))
@@ -516,43 +514,11 @@ otherwise."
 	  op
 	(point)))))
 
-;; Thanks go to Richard Levitte <levitte@e.kth.se> who helped to make these
-;; work under VMS, and to David Hughes <ukchugd@ukpmr.cs.philips.nl> who
+;; Thanks go to David Hughes <ukchugd@ukpmr.cs.philips.nl> who
 ;; helped to make it work on PC.
-(defun he-file-name-nondirectory (file)
-  "Fix to make `file-name-nondirectory' work for hippie-expand under VMS."
-  (if (memq system-type '(axp-vms vax-vms))
-      (let ((n (file-name-nondirectory file)))
-	(if (string-match "^\\(\\[.*\\)\\.\\([^\\.]*\\)$" n)
-	    (concat "[." (substring n (match-beginning 2) (match-end 2)))
-	  n))
-    (file-name-nondirectory file)))
-
-(defun he-file-name-directory (file)
-  "Fix to make `file-name-directory' work for hippie-expand under VMS."
-  (if (memq system-type '(axp-vms vax-vms))
-      (let ((n (file-name-nondirectory file))
-	    (d (file-name-directory file)))
-	(if (string-match "^\\(\\[.*\\)\\.\\([^\\.]*\\)$" n)
-	    (concat d (substring n (match-beginning 1) (match-end 1)) "]")
-	  d))
-    (file-name-directory file)))
-
-(defun he-file-directory-p (file)
-  "Fix to make `file-directory-p' work for hippie-expand under VMS."
-  (if (memq system-type '(vax-vms axp-vms))
-      (or (file-directory-p file)
-	  (file-directory-p (concat file "[000000]")))
-    (file-directory-p file)))
-
 (defun he-concat-directory-file-name (dir-part name-part)
   "Try to slam together two parts of a file specification, system dependently."
   (cond ((null dir-part) name-part)
-	((memq system-type '(axp-vms vax-vms))
-	 (if (and (string= (substring dir-part -1) "]")
-		  (string= (substring name-part 0 2) "[."))
-	     (concat (substring dir-part 0 -1) (substring name-part 1))
-	   (concat dir-part name-part)))
 	((memq system-type '(ms-dos w32))
 	 (if (and (string-match "\\\\" dir-part)
 		  (not (string-match "/" dir-part))
diff --git a/lisp/international/latexenc.el b/lisp/international/latexenc.el
index 79786fb2d34..70e77377426 100644
--- a/lisp/international/latexenc.el
+++ b/lisp/international/latexenc.el
@@ -63,8 +63,6 @@
     ("cp852" . cp852) ; IBM code page 852
     ("cp858" . cp858) ; IBM code page 850 but with a euro symbol
     ("cp865" . cp865) ; IBM code page 865
-    ;; The DECMultinational charaterset used by the OpenVMS system
-    ;; ("decmulti" . undecided)
     ("latin1" . iso-8859-1)
     ("latin2" . iso-8859-2)
     ("latin3" . iso-8859-3)
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 35c696dc916..be4a679fafd 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1662,7 +1662,7 @@ This is used for loading and byte-compiling Emacs Lisp files.")
 (defun auto-coding-alist-lookup (filename)
   "Return the coding system specified by `auto-coding-alist' for FILENAME."
   (let ((alist auto-coding-alist)
-	(case-fold-search (memq system-type '(vax-vms windows-nt ms-dos cygwin)))
+	(case-fold-search (memq system-type '(windows-nt ms-dos cygwin)))
 	coding-system)
     (while (and alist (not coding-system))
       (if (string-match (car (car alist)) filename)
diff --git a/lisp/loadup.el b/lisp/loadup.el
index c913be436ac..99abe3a48a8 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -166,9 +166,6 @@
 (message "%s" (garbage-collect))
 
 (load "replace")
-(if (eq system-type 'vax-vms)
-    (progn
-      (load "vmsproc")))
 (load "buff-menu")
 
 (if (fboundp 'x-create-frame)
@@ -187,9 +184,6 @@
 
 (message "%s" (garbage-collect))
 
-(if (eq system-type 'vax-vms)
-    (progn
-      (load "vms-patch")))
 (if (eq system-type 'windows-nt)
     (progn
       (load "w32-vars")
@@ -230,7 +224,7 @@
 ;doc strings kept in the DOC file rather than in core,
 ;you may load them with a "site-load.el" file.
 ;But you must also cause them to be scanned when the DOC file
-;is generated.  For VMS, you must edit ../vms/makedoc.com.
+;is generated.
 ;For other systems, you must edit ../src/Makefile.in.
 (if (load "site-load" t)
     (garbage-collect))
@@ -341,11 +335,7 @@
 
 (if (or (member (nth 3 command-line-args) '("dump" "bootstrap"))
 	(member (nth 4 command-line-args) '("dump" "bootstrap")))
-    (if (eq system-type 'vax-vms)
-	(progn
-	  (message "Dumping data as file temacs.dump")
-	  (dump-emacs "temacs.dump" "temacs")
-	  (kill-emacs))
+    (progn
       (if (memq system-type '(ms-dos windows-nt cygwin))
           (message "Dumping under the name emacs")
         (message "Dumping under the name emacs"))
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 08d07eb03a7..feedce0790f 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -30,7 +30,7 @@
 ;; This file redefines the function `insert-directory' to implement it
 ;; directly from Emacs lisp, without running ls in a subprocess.  It
 ;; is useful if you cannot afford to fork Emacs on a real memory UNIX,
-;; under VMS or other non-UNIX platforms if you don't have the ls
+;; or other non-UNIX platforms if you don't have the ls
 ;; program, or if you want a different format from what ls offers.
 
 ;; This function can use regexps instead of shell wildcards.  If you
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index dfc14c02164..d0cbbb6a89a 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -808,30 +808,21 @@ without having to answer no to the individual message prompts."
   :type 'boolean)
 
 
-;; I provided a default for VMS because someone asked for it (the
-;; normal default doesn't work there), but, puh-lease!, it is a user
-;; definable option, so if you don't like the default, change it to
-;; whatever you want.  I am unable to directly test the VMS goop
-;; provided here by levitte@lp.se (Richard Levitte - VMS Whacker).
 (defcustom feedmail-queue-directory
-  (if (memq system-type '(axp-vms vax-vms))
-      (expand-file-name (concat (getenv "HOME") "[.MAIL.Q]"))
-    (concat (getenv "HOME") "/mail/q"))
+  (concat (getenv "HOME") "/mail/q")
   "*Name of a directory where messages will be queued.
 Directory will be created if necessary.  Should be a string that
-doesn't end with a slash.  Default, except on VMS, is \"$HOME/mail/q\"."
+doesn't end with a slash.  Default is \"$HOME/mail/q\"."
   :group 'feedmail-queue
   :type 'string
   )
 
 
 (defcustom feedmail-queue-draft-directory
-  (if (memq system-type '(axp-vms vax-vms))
-      (expand-file-name (concat (getenv "HOME") "[.MAIL.DRAFT]"))
-    (concat (getenv "HOME") "/mail/draft"))
+  (concat (getenv "HOME") "/mail/draft")
   "*Name of a directory where draft messages will be queued.
 Directory will be created if necessary.  Should be a string that
-doesn't end with a slash.  Default, except on VMS, is \"$HOME/mail/draft\"."
+doesn't end with a slash.  Default is \"$HOME/mail/draft\"."
   :group 'feedmail-queue
   :type 'string
   )
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 6bae7cdfda4..87318f8fe24 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1068,7 +1068,7 @@ specified by COMMON-SUBSTRING."
   "Current predicate used by `read-file-name-internal'.")
 
 (defcustom read-file-name-completion-ignore-case
-  (if (memq system-type '(ms-dos windows-nt darwin macos vax-vms axp-vms))
+  (if (memq system-type '(ms-dos windows-nt darwin))
       t nil)
   "Non-nil means when reading a file name completion ignores case."
   :group 'minibuffer
diff --git a/lisp/nxml/nxml-enc.el b/lisp/nxml/nxml-enc.el
index 8877fee8db2..26d028becf4 100644
--- a/lisp/nxml/nxml-enc.el
+++ b/lisp/nxml/nxml-enc.el
@@ -32,7 +32,7 @@
 ;;; Code:
 
 (defvar nxml-file-name-ignore-case
-  (memq system-type '(vax-vms windows-nt)))
+  (memq system-type '(windows-nt)))
 
 (defvar nxml-cached-file-name-auto-coding-regexp nil)
 (defvar nxml-cached-auto-mode-alist nil)
diff --git a/lisp/obsolete/vms-patch.el b/lisp/obsolete/vms-patch.el
deleted file mode 100644
index 14c9bd19e88..00000000000
--- a/lisp/obsolete/vms-patch.el
+++ /dev/null
@@ -1,270 +0,0 @@
-;; -*- no-byte-compile: t -*-
-;; Not byte compiled because it uses functions that are not part of
-;; emacs, so it would generate unnecessary warnings.
-;;; vms-patch.el --- override parts of files.el for VMS
-
-;; Copyright (C) 1986, 1992, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-;; Maintainer: FSF
-;; Keywords: vms
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;; Code:
-
-(defvar print-region-function)
-
-(setq auto-mode-alist (cons '(("\\.com\\'" . dcl-mode)) auto-mode-alist))
-
-;;; Functions that need redefinition
-
-;;; VMS file names are upper case, but buffer names are more
-;;; convenient in lower case.
-
-(defun create-file-buffer (filename)
-  "Create a suitably named buffer for visiting FILENAME, and return it.
-FILENAME (sans directory) is used unchanged if that name is free;
-otherwise a string <2> or <3> or ... is appended to get an unused name."
-  (generate-new-buffer (downcase (file-name-nondirectory filename))))
-
-;;; Given a string FN, return a similar name which is a valid VMS filename.
-;;; This is used to avoid invalid auto save file names.
-(defun make-valid-file-name (fn)
-  (setq fn (copy-sequence fn))
-  (let ((dot nil) (indx 0) (len (length fn)) chr)
-    (while (< indx len)
-      (setq chr (aref fn indx))
-      (cond
-       ((eq chr ?.) (if dot (aset fn indx ?_) (setq dot t)))
-       ((not (or (and (>= chr ?a) (<= chr ?z)) (and (>= chr ?A) (<= chr ?Z))
-		 (and (>= chr ?0) (<= chr ?9))
-		 (eq chr ?$) (eq chr ?_) (and (eq chr ?-) (> indx 0))))
-	(aset fn indx ?_)))
-      (setq indx (1+ indx))))
-  fn)
-
-(define-obsolete-function-alias 'make-legal-file-name 'make-valid-file-name "23.1")
-
-;;; Auto save filesnames start with _$ and end with $.
-
-(defun make-auto-save-file-name ()
-  "Return file name to use for auto-saves of current buffer.
-This function does not consider `auto-save-visited-file-name';
-the caller should check that before calling this function.
-This is a separate function so that your `.emacs' file or the site's
-`site-init.el' can redefine it.
-See also `auto-save-file-name-p'."
-  (if buffer-file-name
-      (concat (file-name-directory buffer-file-name)
-	      "_$"
-	      (file-name-nondirectory buffer-file-name)
-	      "$")
-    (expand-file-name (concat "_$_" (make-valid-file-name (buffer-name)) "$"))))
-
-(defun auto-save-file-name-p (filename)
-  "Return t if FILENAME can be yielded by `make-auto-save-file-name'.
-FILENAME should lack slashes.
-This is a separate function so that your `.emacs' file or the site's
-`site-init.el' can redefine it."
-  (string-match "^_\\$.*\\$" filename))
-
-;;;
-;;; This goes along with kepteditor.com which defines these logicals
-;;; If EMACS_COMMAND_ARGS is defined, it supersedes EMACS_FILE_NAME,
-;;;   which is probably set up incorrectly anyway.
-;;; The function command-line-again is a kludge, but it does the job.
-;;;
-(defun vms-suspend-resume-hook ()
-  "When resuming suspended Emacs, check for file to be found.
-If the logical name `EMACS_FILE_NAME' is defined, `find-file' that file."
-  (let ((file (vms-system-info "LOGICAL" "EMACS_FILE_NAME"))
-	(args (vms-system-info "LOGICAL" "EMACS_COMMAND_ARGS"))
-	(line (vms-system-info "LOGICAL" "EMACS_FILE_LINE")))
-    (if (not args)
-	(if file
-	    (progn (find-file file)
-		   (if line (goto-line (string-to-number line)))))
-      (cd (file-name-directory file))
-      (vms-command-line-again))))
-
-(setq suspend-resume-hook 'vms-suspend-resume-hook)
-
-(defun vms-suspend-hook ()
-  "Don't allow suspending if logical name `DONT_SUSPEND_EMACS' is defined."
-  (if (vms-system-info "LOGICAL" "DONT_SUSPEND_EMACS")
-      (error "Can't suspend this emacs"))
-  nil)
-
-(setq suspend-hook 'vms-suspend-hook)
-
-;;;
-;;; A kludge that allows reprocessing of the command line.  This is mostly
-;;;   to allow a spawned VMS mail process to do something reasonable when
-;;;   used in conjunction with the modifications to sysdep.c that allow
-;;;   Emacs to attach to a "foster" parent.
-;;;
-(defun vms-command-line-again ()
-  "Reprocess command line arguments.  VMS specific.
-Command line arguments are initialized from the logical EMACS_COMMAND_ARGS
-which is defined by kepteditor.com.  On VMS this allows attaching to a
-spawned Emacs and doing things like \"emacs -l myfile.el -f doit\""
-  (let* ((args (downcase (vms-system-info "LOGICAL" "EMACS_COMMAND_ARGS")))
-	 (command-line-args (list "emacs"))
-	 (beg 0)
-	 (end 0)
-	 (len (length args))
-	 this-char)
-    (if args
-	(progn
-;;; replace non-printable stuff with spaces
-	  (while (< beg (length args))
-	    (if (or (> 33 (setq this-char (aref args beg)))
-		    (< 127 this-char))
-		(aset args beg 32))
-	    (setq beg (1+ beg)))
-	  (setq beg (1- (length args)))
-	  (while (= 32 (aref args beg)) (setq beg (1- beg)))
-	  (setq args (substring args 0 (1+ beg)))
-	  (setq beg 0)
-;;; now start parsing args
-	  (while (< beg (length args))
-	    (while (and (< beg (length args))
-			(or (> 33 (setq this-char (aref args beg)))
-			    (< 127 this-char))
-			(setq beg (1+ beg))))
-	    (setq end (1+ beg))
-	    (while (and (< end (length args))
-			(< 32 (setq this-char (aref args end)))
-			(> 127 this-char))
-	      (setq end (1+ end)))
-	    (setq command-line-args (append
-				     command-line-args
-				     (list (substring args beg end))))
-	    (setq beg (1+ end)))
-	  (command-line)))))
-
-(defun vms-read-directory (dirname switches buffer)
-  (save-excursion
-    (set-buffer buffer)
-    (subprocess-command-to-buffer
-     (concat "DIRECTORY " switches " " dirname)
-     buffer)
-    (goto-char (point-min))
-    ;; Remove all the trailing blanks.
-    (while (search-forward " \n")
-      (forward-char -1)
-      (delete-horizontal-space))
-    (goto-char (point-min))))
-
-(setq dired-listing-switches
-      "/SIZE/DATE/OWNER/WIDTH=(FILENAME=32,SIZE=5)")
-
-(setq print-region-function
-      (lambda (start end command ign1 ign2 ign3 &rest switches)
-	 (write-region start end "sys$login:delete-me.txt")
-	 (send-command-to-subprocess
-	  1
-	  (concat command
-		  " sys$login:delete-me.txt/name=\"GNUprintbuffer\" "
-		  (mapconcat 'identity switches " "))
-	  nil nil nil)))
-
-;;;
-;;; Fuctions for using Emacs as a VMS Mail editor
-;;;
-(autoload 'vms-pmail-setup "vms-pmail"
-  "Set up file assuming use by VMS Mail utility.
-The buffer is put into text-mode, auto-save is turned off and the
-following bindings are established.
-
-\\[vms-pmail-save-and-exit]	vms-pmail-save-and-exit
-\\[vms-pmail-abort]	vms-pmail-abort
-
-All other Emacs commands are still available."
-  t)
-
-;;;
-;;; Filename handling in the minibuffer
-;;;
-(defun vms-magic-right-square-brace ()
-  "\
-Insert a right square brace, but do other things first depending on context.
-During filename completion, when point is at the end of the line and the
-character before is not a right square brace, do one of three things before
-inserting the brace:
- - If there are already two left square braces preceding, do nothing special.
- - If there is a previous right-square-brace, convert it to dot.
- - If the character before is dot, delete it.
-Additionally, if the preceding chars are right-square-brace followed by
-either \"-\" or \"..\", strip one level of directory hierarchy."
-  (interactive)
-  (when (and minibuffer-completing-file-name
-	     (= (point) (point-max))
-	     (not (= 93 (char-before))))
-    (cond
-     ;; Avoid clobbering: user:[one.path][another.path
-     ((search-backward "[" (field-beginning) t 2))
-     ((search-backward "]" (field-beginning) t)
-      (delete-char 1)
-      (insert ".")
-      (goto-char (point-max)))
-     ((= ?. (char-before))
-      (delete-char -1)))
-    (goto-char (point-max))
-    (let ((specs '(".." "-"))
-	  (pmax (point-max)))
-      (while specs
-	(let* ((up (car specs))
-	       (len (length up))
-	       (cut (- (point) len)))
-	  (when (and (< (1+ len) pmax)
-		     (= ?. (char-before cut))
-		     (string= up (buffer-substring cut (point))))
-	    (delete-char (- (1+ len)))
-	    (while (not (let ((c (char-before)))
-			  (or (= ?. c) (= 91 c))))
-	      (delete-char -1))
-	    (when (= ?. (char-before)) (delete-char -1))
-	    (setq specs nil)))
-	(setq specs (cdr specs)))))
-  (insert "]"))
-
-(defun vms-magic-colon ()
-  "\
-Insert a colon, but do other things first depending on context.
-During filename completion, when point is at the end of the line
-and the line contains a right square brace, remove all characters
-from the beginning of the line up to and including such brace.
-This enables one to type a new filespec without having to delete
-the old one."
-  (interactive)
-  (when (and minibuffer-completing-file-name
-	     (= (point) (point-max))
-             (search-backward "]" (field-beginning) t))
-    (delete-region (field-beginning) (1+ (point)))
-    (goto-char (point-max)))
-  (insert ":"))
-
-(let ((m minibuffer-local-completion-map))
-  (define-key m "]" 'vms-magic-right-square-brace)
-  (define-key m "/" 'vms-magic-right-square-brace)
-  (define-key m ":" 'vms-magic-colon))
-
-;; arch-tag: c178494e-2c37-4d02-99b7-e47e615656cf
-;;; vms-patch.el ends here
diff --git a/lisp/obsolete/vms-pmail.el b/lisp/obsolete/vms-pmail.el
deleted file mode 100644
index d4eb15cdcca..00000000000
--- a/lisp/obsolete/vms-pmail.el
+++ /dev/null
@@ -1,125 +0,0 @@
-;; -*- no-byte-compile: t -*-
-;; Not byte compiled because it uses functions that are not part of
-;; emacs, so it would generate unnecessary warnings.
-;;; vms-pmail.el --- use Emacs as the editor within VMS mail
-
-;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
-
-;; Author: Roland B Roberts <roberts@panix.com>
-;; Maintainer: FSF
-;; Keywords: vms
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;; Code:
-
-;;;
-;;; Quick hack to use emacs as mail editor.  There are a *bunch* of
-;;; changes scattered throughout emacs to make this work, namely:
-;;; (1) mod to sysdep.c to allow emacs to attach to a process other
-;;;     than the one that originally spawned it.
-;;; (2) mod to kepteditor.com to define the logical emacs_parent_pid
-;;;     which is what sysdep.c looks for, and define the logical
-;;;     emacs_command_args which contains the command line
-;;; (3) mod to re-parse command line arguments from emacs_command_args
-;;;     then execute them as though emacs were just starting up.
-;;;
-(defun vms-pmail-save-and-exit ()
-  "Save current buffer and exit Emacs.
-If this Emacs cannot be suspended, you will be prompted about modified
-buffers other than the mail buffer.  BEWARE --- suspending Emacs without
-saving your mail buffer causes mail to abort the send (potentially useful
-since the mail buffer is still here)."
-  (interactive)
-  (basic-save-buffer)
-  (if (vms-system-info "LOGICAL" "DONT_SUSPEND_EMACS")
-      (progn
-        (save-some-buffers)
-        (kill-emacs 1))
-    (kill-buffer (current-buffer))
-    (suspend-emacs)))
-
-(defun vms-pmail-abort ()
-  "Mark buffer as unmodified and exit Emacs.
-When the editor is exited without saving its buffer, VMS mail does not
-send a message.  If you have other modified buffers you will be
-prompted for what to do with them."
-  (interactive)
-  (if (not (yes-or-no-p "Really abort mail? "))
-      (ding)
-    (not-modified)
-    (if (vms-system-info "LOGICAL" "DONT_SUSPEND_EMACS")
-        (progn
-          (save-some-buffers)
-          (kill-emacs 1))
-      (kill-buffer (current-buffer))
-      (suspend-emacs))))
-
-(defun vms-pmail-setup ()
-  "Set up file assuming use by VMS MAIL utility.
-The buffer is put into text-mode, auto-save is turned off and the
-following bindings are established.
-
-\\[vms-pmail-save-and-exit]	vms-pmail-save-and-exit
-\\[vms-pmail-abort]	vms-pmail-abort
-
-All other Emacs commands are still available."
-  (interactive)
-  (auto-save-mode -1)
-  (text-mode)
-  (let ((default (vms-system-info "LOGICAL" "SYS$SCRATCH"))
-        (directory (file-name-directory (buffer-file-name)))
-        (filename (file-name-nondirectory (buffer-file-name))))
-    (if (string= directory "SYS$SCRATCH:")
-        (progn
-          (cd default)
-          (setq buffer-file-name (concat default filename))))
-    (use-local-map (copy-keymap (current-local-map)))
-    (local-set-key "\C-c\C-c" 'vms-pmail-save-and-exit)
-    (local-set-key "\C-c\C-g" 'vms-pmail-abort)))
-
-(defun indicate-mail-reply-text ()
-  "Prepares received mail for re-sending by placing >'s on each line."
-  (interactive)
-  (goto-char (point-min))
-  (while (not (eobp))
-    (insert ">")
-    (beginning-of-line)
-    (forward-line 1))
-  (set-buffer-modified-p nil)
-  (goto-char (point-min)))
-
-(defun insert-signature ()
-  "Moves to the end of the buffer and inserts a \"signature\" file.
-First try the file indicated by environment variable MAIL$TRAILER.
-If that fails, try the file \"~/.signature\".
-If neither file exists, fails quietly."
-  (interactive)
-  (goto-char (point-max))
-  (newline)
-  (if (vms-system-info "LOGICAL" "MAIL$TRAILER")
-      (if (file-attributes (vms-system-info "LOGICAL" "MAIL$TRAILER"))
-	  (insert-file-contents (vms-system-info "LOGICAL" "MAIL$TRAILER"))
-	(if (file-attributes "~/.signature")
-	    (insert-file-contents "~/.signature")))))
-
-(provide 'vms-pmail)
-
-;; arch-tag: 336850fc-7812-4663-8e4d-b9c13f47dce1
-;;; vms-pmail.el ends here
diff --git a/lisp/obsolete/vmsproc.el b/lisp/obsolete/vmsproc.el
deleted file mode 100644
index 83de4d9350f..00000000000
--- a/lisp/obsolete/vmsproc.el
+++ /dev/null
@@ -1,148 +0,0 @@
-;; -*- no-byte-compile: t -*-
-;; Not byte compiled because it uses functions that are not part of
-;; emacs, so it would generate unnecessary warnings.
-;;; vmsproc.el --- run asynchronous VMS subprocesses under Emacs
-
-;; Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
-
-;; Author: Mukesh Prasad
-;; Maintainer: FSF
-;; Keywords: vms
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;; Code:
-
-(defvar display-subprocess-window nil
-  "If non-nil, the subprocess window is displayed whenever input is received.")
-
-(defvar command-prefix-string "$ "
-  "String to insert to distinguish commands entered by user.")
-
-(defvar subprocess-running nil)
-(defvar subprocess-buf nil)
-
-(defvar command-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "\C-m" 'command-send-input)
-    (define-key map "\C-u" 'command-kill-line)
-    map))
-
-(defun subprocess-input (name str)
-  "Handle input from a subprocess.  Called by Emacs."
-  (if display-subprocess-window
-      (display-buffer subprocess-buf))
-  (with-current-buffer subprocess-buf
-    (goto-char (point-max))
-    (insert str ?\n)))
-
-(defun subprocess-exit (name)
-  "Called by Emacs upon subprocess exit."
-  (setq subprocess-running nil))
-
-(defun start-subprocess ()
-  "Spawn an asynchronous subprocess with output redirected to
-the buffer *COMMAND*.  Within this buffer, use C-m to send
-the last line to the subprocess or to bring another line to
-the end."
-  (if subprocess-running
-      (return t))
-  (setq subprocess-buf (get-buffer-create "*COMMAND*"))
-  (with-current-buffer subprocess-buf
-    (use-local-map command-mode-map))
-  (setq subprocess-running (spawn-subprocess 1 'subprocess-input
-					     'subprocess-exit))
-  ;; Initialize subprocess so it doesn't panic and die upon
-  ;; encountering the first error.
-  (and subprocess-running
-       (send-command-to-subprocess 1 "ON SEVERE_ERROR THEN CONTINUE")))
-
-(defun subprocess-command-to-buffer (command buffer)
-  "Execute COMMAND and redirect output into BUFFER."
-  (let (cmd args)
-    (setq cmd (substring command 0 (string-match " " command)))
-    (setq args (substring command (string-match " " command)))
-    (call-process cmd nil buffer nil "*dcl*" args)))
-  ;; BUGS: only the output up to the end of the first image activation is trapped.
-  ;; (if (not subprocess-running)
-  ;;     (start-subprocess))
-  ;; (with-current-buffer buffer
-  ;;   (let ((output-filename (concat "SYS$SCRATCH:OUTPUT-FOR-"
-  ;;       			   (getenv "USER") ".LISTING")))
-  ;;     (while (file-exists-p output-filename)
-  ;;       (delete-file output-filename))
-  ;;     (define-logical-name "SYS$OUTPUT" (concat output-filename "-NEW"))
-  ;;     (send-command-to-subprocess 1 command)
-  ;;     (send-command-to-subprocess 1 (concat
-  ;;       			     "RENAME " output-filename
-  ;;       			     "-NEW " output-filename))
-  ;;     (while (not (file-exists-p output-filename))
-  ;;       (sleep-for 1))
-  ;;     (define-logical-name "SYS$OUTPUT" nil)
-  ;;     (insert-file output-filename)
-  ;;     (delete-file output-filename))))
-
-(defun subprocess-command ()
-  "Start asynchronous subprocess if not running and switch to its window."
-  (interactive)
-  (if (not subprocess-running)
-      (start-subprocess))
-  (and subprocess-running
-       (progn (pop-to-buffer subprocess-buf) (goto-char (point-max)))))
-
-(defun command-send-input ()
-  "If at last line of buffer, send the current line to
-the spawned subprocess.  Otherwise bring back current
-line to the last line for resubmission."
-  (interactive)
-  (beginning-of-line)
-  (let ((current-line (buffer-substring (point) (line-end-position))))
-    (if (eobp)
-	(progn
-	  (if (not subprocess-running)
-	      (start-subprocess))
-	  (if subprocess-running
-	      (progn
-		(beginning-of-line)
-		(send-command-to-subprocess 1 current-line)
-		(if command-prefix-string
-		    (progn (beginning-of-line) (insert command-prefix-string)))
-		(forward-line 1))))
-      ;; else -- if not at last line in buffer
-      (goto-char (point-max))
-      (backward-char)
-      (forward-line 1)
-      (insert
-       (if (compare-strings command-prefix-string nil nil
-                            current-line 0 (length command-prefix-string))
-           (substring current-line (length command-prefix-string))
-         current-line)))))
-
-(defun command-kill-line ()
-  "Kill the current line.  Used in command mode."
-  (interactive)
-  (beginning-of-line)
-  (kill-line))
-
-(define-key esc-map "$" 'subprocess-command)
-
-(provide 'vmsproc)
-
-;; arch-tag: 600b2512-f903-4887-bcd2-e76b306f5b66
-;;; vmsproc.el ends here
diff --git a/lisp/paths.el b/lisp/paths.el
index 15705fc8cae..2dc1f977cb7 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -176,15 +176,13 @@ Its name should end with a slash.")
   :group 'environment
   :type 'file)
 
-(defvar term-file-prefix (if (eq system-type 'vax-vms) "[.term]" "term/") "\
+(defvar term-file-prefix "term/" "\
 If non-nil, Emacs startup does (load (concat term-file-prefix (getenv \"TERM\")))
 You may set this variable to nil in your `.emacs' file if you do not wish
 the terminal-initialization file to be loaded.")
 
 (defvar abbrev-file-name
-  (if (eq system-type 'vax-vms)
-      "~/abbrev.def"
-    (convert-standard-filename "~/.abbrev_defs"))
+  (convert-standard-filename "~/.abbrev_defs")
   "*Default name of file to read abbrevs from.")
 
 ;; arch-tag: bae27ffb-9944-4c87-b569-30d4635a99e1
diff --git a/lisp/printing.el b/lisp/printing.el
index 8fac4bf2981..85e4b5ea4bb 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -2214,7 +2214,6 @@ Useful links:
      (file-name-as-directory
       (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP")
 	  (cond (ps-windows-system "c:/temp")
-		((memq system-type '(vax-vms axp-vms)) "SYS$SCRATCH:")
 		(t "/tmp")
 		)))))
   "*Specify a directory for temporary files during printing.
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 589e5ebbd3b..0a21a9dcc8e 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -300,7 +300,7 @@ used as shortcuts to open the Nth file."
 ;;; Utilities
 ;;
 (defconst recentf-case-fold-search
-  (memq system-type '(vax-vms windows-nt cygwin))
+  (memq system-type '(windows-nt cygwin))
   "Non-nil if recentf searches and matches should ignore case.")
 
 (defsubst recentf-string-equal (s1 s2)
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index 5481bbaf2b0..8b311d5e9ff 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -762,7 +762,7 @@ look for files that have been changed and need to be copied to other systems."
 				(buffer-list))))
 	   (yes-or-no-p "Modified buffers exist; exit anyway? "))
        (or (not (fboundp 'process-list))
-	   ;; process-list is not defined on VMS.
+	   ;; process-list is not defined on MSDOS.
 	   (let ((processes (process-list))
 		 active)
 	     (while processes
diff --git a/lisp/sort.el b/lisp/sort.el
index d08e07dc4b9..02e45158df1 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -491,7 +491,7 @@ Use \\[untabify] to convert tabs to spaces before sorting."
       (setq col-end (max col-beg1 col-end1))
       (if (search-backward "\t" beg1 t)
 	  (error "sort-columns does not work with tabs -- use M-x untabify"))
-      (if (not (or (memq system-type '(vax-vms windows-nt))
+      (if (not (or (memq system-type '(windows-nt))
 		   (let ((pos beg1) plist fontified)
 		     (catch 'found
 		       (while (< pos end1)
@@ -516,7 +516,7 @@ Use \\[untabify] to convert tabs to spaces before sorting."
 	    (when sort-fold-case
 	      (push "-f" sort-args))
 	    (apply #'call-process-region beg1 end1 "sort" t t nil sort-args))
-	;; On VMS and ms-windows, use Emacs's own facilities.
+	;; On ms-windows, use Emacs's own facilities.
 	(save-excursion
 	  (save-restriction
 	    (narrow-to-region beg1 end1)
diff --git a/lisp/startup.el b/lisp/startup.el
index 3d2217f3eab..dd387672091 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -491,20 +491,19 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
         ;; the end, because the subdirs.el files may add elements to the end
         ;; of load-path and we want to take it into account.
         (setq tail (cdr tail))))
-    (unless (eq system-type 'vax-vms)
-      ;; If the PWD environment variable isn't accurate, delete it.
-      (let ((pwd (getenv "PWD")))
-	(and (stringp pwd)
-	     ;; Use FOO/., so that if FOO is a symlink, file-attributes
-	     ;; describes the directory linked to, not FOO itself.
-	     (or (equal (file-attributes
-			 (concat (file-name-as-directory pwd) "."))
-			(file-attributes
-			 (concat (file-name-as-directory default-directory)
-				 ".")))
-		 (setq process-environment
-		       (delete (concat "PWD=" pwd)
-			       process-environment))))))
+    ;; If the PWD environment variable isn't accurate, delete it.
+    (let ((pwd (getenv "PWD")))
+      (and (stringp pwd)
+	   ;; Use FOO/., so that if FOO is a symlink, file-attributes
+	   ;; describes the directory linked to, not FOO itself.
+	   (or (equal (file-attributes
+		       (concat (file-name-as-directory pwd) "."))
+		      (file-attributes
+		       (concat (file-name-as-directory default-directory)
+			       ".")))
+	       (setq process-environment
+		     (delete (concat "PWD=" pwd)
+			     process-environment)))))
     (setq default-directory (abbreviate-file-name default-directory))
     (let ((menubar-bindings-done nil))
       (unwind-protect
@@ -1007,8 +1006,6 @@ opening the first frame (e.g. open a connection to an X server).")
 				   "~/_emacs"
 				 ;; But default to .emacs if _emacs does not exist.
 				 "~/.emacs")))
-			    ((eq system-type 'vax-vms)
-			     "sys$login:.emacs")
 			    (t
 			     (concat "~" init-file-user "/.emacs")))))
 		      ;; This tells `load' to store the file name found
diff --git a/lisp/subr.el b/lisp/subr.el
index b673980510c..b15e463693a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2406,14 +2406,10 @@ passing the command to the shell.
 Wildcards and redirection are handled as usual in the shell.
 
 \(fn NAME BUFFER COMMAND &rest COMMAND-ARGS)"
-  (cond
-   ((eq system-type 'vax-vms)
-    (apply 'start-process name buffer args))
    ;; We used to use `exec' to replace the shell with the command,
    ;; but that failed to handle (...) and semicolon, etc.
-   (t
-    (start-process name buffer shell-file-name shell-command-switch
-		   (mapconcat 'identity args " ")))))
+  (start-process name buffer shell-file-name shell-command-switch
+		 (mapconcat 'identity args " ")))
 
 (defun start-file-process-shell-command (name buffer &rest args)
   "Start a program in a subprocess.  Return the process object for it.
@@ -2445,16 +2441,12 @@ If BUFFER is 0, `call-process-shell-command' returns immediately with value nil.
 Otherwise it waits for COMMAND to terminate and returns a numeric exit
 status or a signal description string.
 If you quit, the process is killed with SIGINT, or SIGKILL if you quit again."
-  (cond
-   ((eq system-type 'vax-vms)
-    (apply 'call-process command infile buffer display args))
-   ;; We used to use `exec' to replace the shell with the command,
-   ;; but that failed to handle (...) and semicolon, etc.
-   (t
-    (call-process shell-file-name
-		  infile buffer display
-		  shell-command-switch
-		  (mapconcat 'identity (cons command args) " ")))))
+  ;; We used to use `exec' to replace the shell with the command,
+  ;; but that failed to handle (...) and semicolon, etc.
+  (call-process shell-file-name
+		infile buffer display
+		shell-command-switch
+		(mapconcat 'identity (cons command args) " ")))
 
 (defun process-file-shell-command (command &optional infile buffer display
 					   &rest args)
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index bbf0714e8ab..412c25aa091 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -2963,29 +2963,6 @@ Default is to leave paragraph indentation as is."
     ("ky" . texinfo-format-kindex)))
 
 
-;;; Sort and index (for VMS)
-
-;; Sort an index which is in the current buffer between START and END.
-;; Used on VMS, where the `sort' utility is not available.
-(defun texinfo-sort-region (start end)
-  (require 'sort)
-  (save-restriction
-    (narrow-to-region start end)
-    (goto-char (point-min))
-    (sort-subr nil 'forward-line 'end-of-line 'texinfo-sort-startkeyfun)))
-
-;; Subroutine for sorting an index.
-;; At start of a line, return a string to sort the line under.
-(defun texinfo-sort-startkeyfun ()
-  (let ((line (buffer-substring-no-properties (point) (line-end-position))))
-    ;; Canonicalize whitespace and eliminate funny chars.
-    (while (string-match "[ \t][ \t]+\\|[^a-z0-9 ]+" line)
-      (setq line (concat (substring line 0 (match-beginning 0))
-                         " "
-                         (substring line (match-end 0)))))
-    line))
-
-
 ;;; @printindex
 
 (put 'printindex 'texinfo-format 'texinfo-format-printindex)
@@ -3002,9 +2979,7 @@ Default is to leave paragraph indentation as is."
     (insert "\n* Menu:\n\n")
     (setq opoint (point))
     (texinfo-print-index nil indexelts)
-    (if (memq system-type '(vax-vms windows-nt ms-dos))
-        (texinfo-sort-region opoint (point))
-      (shell-command-on-region opoint (point) "sort -fd" 1))))
+    (shell-command-on-region opoint (point) "sort -fd" 1)))
 
 (defun texinfo-print-index (file indexelts)
   (while indexelts
diff --git a/lisp/version.el b/lisp/version.el
index e8f1ac5b964..c6d2b6ff462 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -85,7 +85,7 @@ to the system configuration; look at `system-configuration' instead."
 (defalias 'version 'emacs-version)
 
 ;; We put version info into the executable in the form that `ident' uses.
-(or (memq system-type '(vax-vms windows-nt))
+(or (eq system-type 'windows-nt)
     (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))
 		      " $\n")))