From d281a650f22a762b59befca3442f28990ac16cee Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Fri, 23 Mar 2018 10:27:13 +0000 Subject: [PATCH] dot/shell-rc: Only deploy the trivial prompt if not directly under Emacs. This lets TRAMP keep working -- which was the point of this hack -- without defeating complex prompts in Emacs `M-x shell' and similar. --- dot/shell-rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dot/shell-rc b/dot/shell-rc index 4538bc3..4ab0355 100644 --- a/dot/shell-rc +++ b/dot/shell-rc @@ -74,8 +74,8 @@ __mdw_set_prompt_pieces () { } __mdw_set_prompt () { - case "$TERM" in - dumb) + case "$TERM:$INSIDE_EMACS" in + dumb:) case $(id -u) in 0) PS1='# ' ;; *) PS1='$ ' ;; esac PS2='> ' ;; -- 2.11.0