diff options
author | Geoff Voelker <voelker@cs.washington.edu> | 1995-05-28 02:18:09 +0000 |
---|---|---|
committer | Geoff Voelker <voelker@cs.washington.edu> | 1995-05-28 02:18:09 +0000 |
commit | e8d2269e1118f1ed13e7ab262aa7a26be7a104ce (patch) | |
tree | 64595c60ea80994745ae9b528e825c97dd58bd18 | |
parent | 15dbd137955e1ff31c1dc94ef2bda31fcdf7b365 (diff) | |
download | emacs-e8d2269e1118f1ed13e7ab262aa7a26be7a104ce.tar.gz |
Add carriage returns; necessary for batch files on Win95
-rwxr-xr-x | nt/ebuild.bat | 2 | ||||
-rwxr-xr-x | nt/emacs.bat | 88 | ||||
-rwxr-xr-x | nt/fast-install.bat | 2 | ||||
-rwxr-xr-x | nt/install.bat | 2 |
4 files changed, 47 insertions, 47 deletions
diff --git a/nt/ebuild.bat b/nt/ebuild.bat index 6b5247cf2cc..32cea5af9fa 100755 --- a/nt/ebuild.bat +++ b/nt/ebuild.bat @@ -1 +1 @@ -nmake -f makefile.nt all +nmake -f makefile.nt all
diff --git a/nt/emacs.bat b/nt/emacs.bat index 5c67fbca521..14e4893d6df 100755 --- a/nt/emacs.bat +++ b/nt/emacs.bat @@ -1,44 +1,44 @@ -@echo off - -REM Change this to the directory into which you installed Emacs: -set emacs_path=C:\emacs - -REM -REM You shouldn't have to change any of the below. -REM - -REM Set OS specific values. -set ARCH_SAVE=%PROCESSOR_ARCHITECTURE% -set PROCESSOR_ARCHITECTURE= -if "%ARCH_SAVE%" == "%PROCESSOR_ARCHITECTURE%" goto win95 -set PROCESSOR_ARCHITECTURE=%ARCH_SAVE% -set SHELL=cmd -goto next - -:win95 -set SHELL=command - -:next - -set EMACSLOADPATH=%emacs_path%\lisp -set EMACSDATA=%emacs_path%\etc -set EMACSPATH=%emacs_path%\bin -set EMACSLOCKDIR=%emacs_path%\lock -set INFOPATH=%emacs_path%\info -set EMACSDOC=%emacs_path%\etc -set TERM=CMD - -REM The variable HOME is used to find the startup file, ~\_emacs. Ideally, -REM this will not be set in this file but should already be set before -REM this file is invoked. If HOME is not set, use some generic default. - -set HOME_SAVE=%HOME% -set HOME_EXISTS=yes -set HOME_DEFAULT=C:\ -set HOME= -if "%HOME%" == "%HOME_SAVE%" set HOME_EXISTS=no -if "%HOME_EXISTS%" == "yes" set HOME=%HOME_SAVE% -if "%HOME_EXISTS%" == "no" set HOME=%HOME_DEFAULT% -if "%HOME_EXISTS%" == "no" echo HOME is not set! Using %HOME% as a default... - -%emacs_path%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9 +@echo off
+
+REM Change this to the directory into which you installed Emacs:
+set emacs_path=C:\emacs
+
+REM
+REM You shouldn't have to change any of the below.
+REM
+
+REM Set OS specific values.
+set ARCH_SAVE=%PROCESSOR_ARCHITECTURE%
+set PROCESSOR_ARCHITECTURE=
+if "%ARCH_SAVE%" == "%PROCESSOR_ARCHITECTURE%" goto win95
+set PROCESSOR_ARCHITECTURE=%ARCH_SAVE%
+set SHELL=cmd
+goto next
+
+:win95
+set SHELL=command
+
+:next
+
+set EMACSLOADPATH=%emacs_path%\lisp
+set EMACSDATA=%emacs_path%\etc
+set EMACSPATH=%emacs_path%\bin
+set EMACSLOCKDIR=%emacs_path%\lock
+set INFOPATH=%emacs_path%\info
+set EMACSDOC=%emacs_path%\etc
+set TERM=CMD
+
+REM The variable HOME is used to find the startup file, ~\_emacs. Ideally,
+REM this will not be set in this file but should already be set before
+REM this file is invoked. If HOME is not set, use some generic default.
+
+set HOME_SAVE=%HOME%
+set HOME_EXISTS=yes
+set HOME_DEFAULT=C:\
+set HOME=
+if "%HOME%" == "%HOME_SAVE%" set HOME_EXISTS=no
+if "%HOME_EXISTS%" == "yes" set HOME=%HOME_SAVE%
+if "%HOME_EXISTS%" == "no" set HOME=%HOME_DEFAULT%
+if "%HOME_EXISTS%" == "no" echo HOME is not set! Using %HOME% as a default...
+
+%emacs_path%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/nt/fast-install.bat b/nt/fast-install.bat index 072a59061f7..157c4ab8751 100755 --- a/nt/fast-install.bat +++ b/nt/fast-install.bat @@ -1 +1 @@ -nmake -f makefile.nt fast_install +nmake -f makefile.nt fast_install
diff --git a/nt/install.bat b/nt/install.bat index 551d9aae2c3..997702b34ca 100755 --- a/nt/install.bat +++ b/nt/install.bat @@ -1 +1 @@ -nmake -f makefile.nt install +nmake -f makefile.nt install
|