nixos/bash: Fix prompt regression in Emacs term mode #52458
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GrahamcOfBorg
added
6.topic: nixos
GrahamcOfBorg
added
10.rebuild-darwin: 0
Mic92
reviewed
Dec 18, 2018
| @@ -98,7 +98,12 @@ in | |||
| if [ "$TERM" != "dumb" -o -n "$INSIDE_EMACS" ]; then | |||
| PROMPT_COLOR="1;31m" | |||
| let $UID && PROMPT_COLOR="1;32m" | |||
| PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] " | |||
| if [ -n "$INSIDE_EMACS" ]; then | |||
There was a problem hiding this comment.
Is emacs not already skipped in the condition above?
Mic92
reviewed
Dec 18, 2018
| # Emacs term mode doesn't support xterm title escape sequence (\e]0;) | ||
| PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] " | ||
| else | ||
| PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] " |
There was a problem hiding this comment.
What is the difference between \\$ and \$ in that context?
There was a problem hiding this comment.
One would think \\$ should be an escaped backslash and a dollar sign. That's not how it evaluates, though.
matthewbauer
approved these changes
Dec 18, 2018
lukateras
approved these changes
Dec 18, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Fix a regression with the prompt in Emacs
termmode, introduced by #51678.Before:
After:
In gnome-terminal the prompt still updates the window title.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)