about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-08-29 18:01:27 -0400
committerGitHub <noreply@github.com>2019-08-29 18:01:27 -0400
commitc2ef4fd2ba36486a04b01fc58ef8f405ac0e9d49 (patch)
tree713578473a7c171509db62f694054935970fbb59 /nixos
parentbc08b42da4dbdc1c66385bab7a2eae2935e055c0 (diff)
parent844200a06f2b5d27955c39c05163711e9263bb99 (diff)
downloadnixlib-c2ef4fd2ba36486a04b01fc58ef8f405ac0e9d49.tar
nixlib-c2ef4fd2ba36486a04b01fc58ef8f405ac0e9d49.tar.gz
nixlib-c2ef4fd2ba36486a04b01fc58ef8f405ac0e9d49.tar.bz2
nixlib-c2ef4fd2ba36486a04b01fc58ef8f405ac0e9d49.tar.lz
nixlib-c2ef4fd2ba36486a04b01fc58ef8f405ac0e9d49.tar.xz
nixlib-c2ef4fd2ba36486a04b01fc58ef8f405ac0e9d49.tar.zst
nixlib-c2ef4fd2ba36486a04b01fc58ef8f405ac0e9d49.zip
Merge pull request #67728 from kisik21/bash-module-emacs-eterm-remote-prompt-fix
nixos/bash: Improve Emacs detection for PS1
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/programs/bash/bash.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index a7e57b8608d7..99daec5ff5b7 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -98,7 +98,7 @@ in
           if [ "$TERM" != "dumb" -o -n "$INSIDE_EMACS" ]; then
             PROMPT_COLOR="1;31m"
             let $UID && PROMPT_COLOR="1;32m"
-            if [ -n "$INSIDE_EMACS" ]; then
+            if [ -n "$INSIDE_EMACS" -o "$TERM" == "eterm" -o "$TERM" == "eterm-color" ]; then
               # Emacs term mode doesn't support xterm title escape sequence (\e]0;)
               PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
             else