Mercurial > emacs
comparison lisp/shell.el @ 81340:b612fb999814
(shell): Use user-emacs-directory.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Wed, 13 Jun 2007 00:03:49 +0000 |
parents | 24e13e715a20 |
children | 8f00c712c722 3619e7770f2e |
comparison
equal
deleted
inserted
replaced
81339:d8ee6aceb564 | 81340:b612fb999814 |
---|---|
555 (getenv "ESHELL") shell-file-name)) | 555 (getenv "ESHELL") shell-file-name)) |
556 (name (file-name-nondirectory prog)) | 556 (name (file-name-nondirectory prog)) |
557 (startfile (concat "~/.emacs_" name)) | 557 (startfile (concat "~/.emacs_" name)) |
558 (xargs-name (intern-soft (concat "explicit-" name "-args")))) | 558 (xargs-name (intern-soft (concat "explicit-" name "-args")))) |
559 (unless (file-exists-p startfile) | 559 (unless (file-exists-p startfile) |
560 (setq startfile (concat "~/.emacs.d/init_" name ".sh"))) | 560 (setq startfile (concat user-emacs-directory "init_" name ".sh"))) |
561 (apply 'make-comint-in-buffer "shell" buffer prog | 561 (apply 'make-comint-in-buffer "shell" buffer prog |
562 (if (file-exists-p startfile) startfile) | 562 (if (file-exists-p startfile) startfile) |
563 (if (and xargs-name (boundp xargs-name)) | 563 (if (and xargs-name (boundp xargs-name)) |
564 (symbol-value xargs-name) | 564 (symbol-value xargs-name) |
565 '("-i"))) | 565 '("-i"))) |