diff options
| author | Miles Bader <miles@gnu.org> | 2006-09-14 09:24:00 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-09-14 09:24:00 +0000 |
| commit | 863153c57b164f79f030f34dba6953a3d0d60097 (patch) | |
| tree | 85c2823f2a948b0d8757b6787cb059793581339a /lisp/comint.el | |
| parent | fae22cbf7f66b7adc732e46a27b821114c812fdd (diff) | |
| parent | f9536fb238209311e10468e4eb0fa2ac0a309816 (diff) | |
| download | emacs-863153c57b164f79f030f34dba6953a3d0d60097.tar.gz emacs-863153c57b164f79f030f34dba6953a3d0d60097.tar.bz2 emacs-863153c57b164f79f030f34dba6953a3d0d60097.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 427-436)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 134-136)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-110
Diffstat (limited to 'lisp/comint.el')
| -rw-r--r-- | lisp/comint.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/comint.el b/lisp/comint.el index eb5c9f28a4e..5e223ef8f18 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -765,7 +765,8 @@ buffer. The hook `comint-exec-hook' is run after each exec." (format "COLUMNS=%d" (window-width))) (list "TERM=emacs" (format "TERMCAP=emacs:co#%d:tc=unknown:" (window-width)))) - (if (getenv "EMACS") nil (list "EMACS=t")) + (unless (getenv "EMACS") + (list (concat "EMACS=" invocation-directory invocation-name))) process-environment)) (default-directory (if (file-accessible-directory-p default-directory) |