(texinfo-make-menu): Make region-end a marker.

[bpt/emacs.git] / nt / emacs.bat

diff --git a/nt/emacs.bat b/nt/emacs.bat
index c822617..14e4893 100755 (executable)
--- a/nt/emacs.bat
+++ b/nt/emacs.bat
@@ -1,10 +1,26 @@
+@echo off\r
 \r
-set emacs_path=\emacs\r
+REM Change this to the directory into which you installed Emacs:\r
+set emacs_path=C:\emacs\r
 \r
-@echo off\r
+REM\r
+REM You shouldn't have to change any of the below.\r
+REM\r
 \r
-set EMACSLOADPATH=%emacs_path%\lisp\r
+REM Set OS specific values.\r
+set ARCH_SAVE=%PROCESSOR_ARCHITECTURE%\r
+set PROCESSOR_ARCHITECTURE=\r
+if "%ARCH_SAVE%" == "%PROCESSOR_ARCHITECTURE%" goto win95\r
+set PROCESSOR_ARCHITECTURE=%ARCH_SAVE%\r
 set SHELL=cmd\r
+goto next\r
+\r
+:win95\r
+set SHELL=command\r
+\r
+:next\r
+\r
+set EMACSLOADPATH=%emacs_path%\lisp\r
 set EMACSDATA=%emacs_path%\etc\r
 set EMACSPATH=%emacs_path%\bin\r
 set EMACSLOCKDIR=%emacs_path%\lock\r
@@ -12,7 +28,17 @@ set INFOPATH=%emacs_path%\info
 set EMACSDOC=%emacs_path%\etc\r
 set TERM=CMD\r
 \r
-rem To find the ~\_emacs file\r
-set HOME=%emacs_path%\nt\r
+REM The variable HOME is used to find the startup file, ~\_emacs.  Ideally,\r
+REM this will not be set in this file but should already be set before\r
+REM this file is invoked.  If HOME is not set, use some generic default.\r
+\r
+set HOME_SAVE=%HOME%\r
+set HOME_EXISTS=yes\r
+set HOME_DEFAULT=C:\\r
+set HOME=\r
+if "%HOME%" == "%HOME_SAVE%" set HOME_EXISTS=no\r
+if "%HOME_EXISTS%" == "yes" set HOME=%HOME_SAVE%\r
+if "%HOME_EXISTS%" == "no" set HOME=%HOME_DEFAULT%\r
+if "%HOME_EXISTS%" == "no" echo HOME is not set!  Using %HOME% as a default...\r
 \r
 %emacs_path%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9\r