summaryrefslogtreecommitdiff
path: root/make-dist
diff options
context:
space:
mode:
authorPaul Eggert <eggert@twinsun.com>2006-09-12 16:43:25 +0000
committerPaul Eggert <eggert@twinsun.com>2006-09-12 16:43:25 +0000
commit4b1aaa8b07cf2797b5a57e2a1fd88f3ec0aa41e2 (patch)
treee00adba73d181d3d8b6a111ebfc856a0a3acc454 /make-dist
parentafc05254f5403c9d977013c70e4391e7ac1643b6 (diff)
downloademacs-4b1aaa8b07cf2797b5a57e2a1fd88f3ec0aa41e2.tar.gz
* etc/NEWS: In terminal-oriented subshells, the EMACS environment
variable now defaults to Emacs's absolute file name, instead of to "t". * etc/PROBLEMS: Adjust tcsh advice for this. * make-dist (EMACS): Exit and fail if the EMACS environment variable is set to something other than an absolute file name. * lisp/comint.el (comint-exec-1): Set EMACS to the full name of Emacs, not to "t". * lisp/progmodes/compile.el (compilation-start): Likewise. * lisp/progmodes/idlwave.el (idlwave-rescan-asynchronously): Don't use expand-file-name on invocation-directory, since this might mishandle special characters in invocation-directory. * man/faq.texi (Escape sequences in shell output): EMACS is now set to Emacs's absolute file name, not to "t". (^M in the shell buffer): Likewise. * man/misc.texi (Interactive Shell): Likewise.
Diffstat (limited to 'make-dist')
-rwxr-xr-xmake-dist17
1 files changed, 10 insertions, 7 deletions
diff --git a/make-dist b/make-dist
index 70063c22164..0f23a0d3af1 100755
--- a/make-dist
+++ b/make-dist
@@ -120,8 +120,7 @@ if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/version.el ]; then
fi
### Find where to run Emacs.
-### (We don't accept EMACS=t as an answer, since that probably only means
-### that the shell is running in an Emacs window.)
+### (Accept only absolute file names.)
if [ $update = yes ];
then
unset EMACS_UNIBYTE
@@ -129,11 +128,15 @@ then
then
EMACS=`pwd`/src/emacs
else
- if [ "x$EMACS" = "x" -o "x$EMACS" = "xt" ];
- then
- echo You must specify the EMACS environment variable 2>&1
- exit 1
- fi
+ case $EMACS in
+ /*) ;;
+ *)
+ if [ ! -f "$EMACS" ]; then
+ echo "$0: You must specify the EMACS environment variable " \
+ "to an absolute file name." 2>&1
+ exit 1
+ fi;;
+ esac
fi
fi