summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/compiler/scala/tools/ant/templates/tool-unix.tmpl5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
index abf9925ad9..88fee71843 100644
--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
@@ -73,8 +73,7 @@ SEP=":"
# Possible additional command line options
WINDOWS_OPT=""
-EMACS_OPT=""
-[[ -n "$EMACS" ]] && EMACS_OPT="-Denv.emacs=$EMACS"
+EMACS_OPT="-Denv.emacs=$EMACS"
# Remove spaces from SCALA_HOME on windows
if [[ -n "$cygwin" ]]; then
@@ -201,7 +200,7 @@ execCommand \
$(classpathArgs) \
-Dscala.home="$SCALA_HOME" \
-Dscala.usejavacp=true \
- $EMACS_OPT \
+ "$EMACS_OPT" \
$WINDOWS_OPT \
@properties@ @class@ @toolflags@ "$@@"