diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-02-23 09:55:21 -0600 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-02-23 09:55:21 -0600 |
| commit | 6a9767b95216badc5cc8080f430d6a517fbdac4a (patch) | |
| tree | e64d1b9492f2d59b6f40514d9b34fb55cd2e3e82 /src | |
| parent | 3b39089602f08f8f390301de2950b3083beb17b6 (diff) | |
| parent | b530ff0947f9477abece427803cd774768dfb27b (diff) | |
| download | scala-6a9767b95216badc5cc8080f430d6a517fbdac4a.tar.gz scala-6a9767b95216badc5cc8080f430d6a517fbdac4a.tar.bz2 scala-6a9767b95216badc5cc8080f430d6a517fbdac4a.zip | |
Merge pull request #3574 from greenrd/SI-7962
SI-7962 Scalac runner does not work within Emacs's terminal
Diffstat (limited to 'src')
| -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@ "$@@" |