From b530ff0947f9477abece427803cd774768dfb27b Mon Sep 17 00:00:00 2001 From: Robin Green Date: Sat, 22 Feb 2014 10:44:06 +0000 Subject: SI-7962 Scalac runner does not work within Emacs's terminal - Always set the env.emacs system property - scalac only cares about whether the system property has a non-empty value, not whether it is set or not. Fixes 7962 --- src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 5 ++--- 1 file 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@ "$@@" -- cgit v1.2.3