summaryrefslogtreecommitdiff
path: root/.emacs.d
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d')
-rw-r--r--.emacs.d/eshell/profile2
-rw-r--r--.emacs.d/init.el5
2 files changed, 1 insertions, 6 deletions
diff --git a/.emacs.d/eshell/profile b/.emacs.d/eshell/profile
index 42eb0e8a..dccfc2b2 100644
--- a/.emacs.d/eshell/profile
+++ b/.emacs.d/eshell/profile
@@ -1,4 +1,4 @@
-# for processes spawned by Eshell, drop the -c/-t set in ~/.shenv, so that the
+# for processes spawned by Eshell, drop the -t set in ~/.profile, so that the
# Emacs frame containing Eshell gets reused, and pass -s if necessary
export EDITOR="emacsclient$(if (stringp (daemonp)) (concat \" -s\" (daemonp)) \"\")"
export VISUAL="$EDITOR"
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 6fea6cb5..0c05d204 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -699,11 +699,6 @@ Lisp Interaction C-j in `lisp-interaction-mode' and similar."
(setenv "TZ" "MST")
(set-time-zone-rule "/usr/share/zoneinfo/America/Phoenix"))
-(when-let ((bash (executable-find "bash")))
- (setq shell-file-name "bash")
- (setenv "SHELL" bash)
- (setenv "BASH_ENV" (expand-file-name "~/.bash_defns")))
-
;;; Opening files in external programs
;;;
;;; For years I used the classic `openwith-mode', but it often breaks other