diff options
| author | Robin Green <greenrd@greenrd.org> | 2014-02-22 10:44:06 +0000 |
|---|---|---|
| committer | Robin Green <greenrd@greenrd.org> | 2014-02-22 11:55:50 +0000 |
| commit | b530ff0947f9477abece427803cd774768dfb27b (patch) | |
| tree | 261b105d762cc16e3e60d27a8e6f0e1609e31782 | |
| parent | 00624a39ed84c3fd245dd9df7454d4cec4399e13 (diff) | |
| download | scala-b530ff0947f9477abece427803cd774768dfb27b.tar.gz scala-b530ff0947f9477abece427803cd774768dfb27b.tar.bz2 scala-b530ff0947f9477abece427803cd774768dfb27b.zip | |
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
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 5 |
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@ "$@@" |