changeset 644:a9aa9260f4a2

Backed out changeset 4f6e9ce2af1a: Switched back to native emacs as Cygwin w32 build has fork problems and issue.
author Oleksandr Gavenko <gavenkoa@gmail.com>
date Thu, 26 Oct 2017 00:39:51 +0300
parents 073940496d59
children 68d8dc79f200
files emacs/e emacs/e.bat
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/emacs/e	Sat Oct 21 21:40:28 2017 +0300
+++ b/emacs/e	Thu Oct 26 00:39:51 2017 +0300
@@ -36,7 +36,7 @@
 esac
 
 if [ -n "$COMSPEC" ]; then
-    exec emacsclientw $args -- "$@"
+    exec emacsclient-w32 $args -- "$@"
 fi
 
 f=`readlink -f "$1"`
--- a/emacs/e.bat	Sat Oct 21 21:40:28 2017 +0300
+++ b/emacs/e.bat	Thu Oct 26 00:39:51 2017 +0300
@@ -10,15 +10,15 @@
 
 REM If path to file contain spaces it must be inclosed into quotes.
 
-rem for %%X in (emacsclient-w32.exe) do (set FOUND=%%~$PATH:X)
-rem if defined FOUND (
-rem   rem Cygwin Emacs-w32.
-rem   set EMACSCLIENT=run.exe --quote emacsclient-w32
-rem ) else (
+for %%X in (emacsclient-w32.exe) do (set FOUND=%%~$PATH:X)
+if defined FOUND (
+  rem Cygwin Emacs-w32.
+  set EMACSCLIENT=run.exe --quote emacsclient-w32
+) else (
   rem Native Emacs.
   set RUNEMACSARG=-a runemacs
   set EMACSCLIENT=emacsclientw
-rem )
+)
 
 if x%1 == x-h     goto usage
 if x%1 == x-help  goto usage