-
-REM Here begins emacs.bat.in
-
-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_dir%\lisp
-set EMACSDATA=%emacs_dir%\etc
-set EMACSPATH=%emacs_dir%\bin
-set EMACSLOCKDIR=%emacs_dir%\lock
-set INFOPATH=%emacs_dir%\info
-set EMACSDOC=%emacs_dir%\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_dir%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
+\r
+REM Here begins emacs.bat.in\r
+\r
+REM Use new proxy shell by default.\r
+set SHELL=%emacs_dir%\bin\cmdproxy.exe\r
+\r
+set EMACSLOADPATH=%emacs_dir%\site-lisp;%emacs_dir%\lisp;%emacs_dir%\leim\r
+set EMACSDATA=%emacs_dir%\etc\r
+set EMACSPATH=%emacs_dir%\bin\r
+set EMACSLOCKDIR=%emacs_dir%\lock\r
+REM set INFOPATH=%emacs_dir%\info\r
+set EMACSDOC=%emacs_dir%\etc\r
+set TERM=CMD\r
+\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_dir%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9\r