* 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.

1 files changed, 13 insertions, 16 deletions

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