Merge branch '2027_bash_prompt'

* 2027_bash_prompt:
  Ticket #2027: don't overwrite the PROMPT_COMMAND bash variable.
This commit is contained in:
Andrew Borodin 2015-02-16 09:14:20 +03:00
commit f5295f790b

View File

@ -874,7 +874,8 @@ init_subshell (void)
{
case BASH:
g_snprintf (precmd, sizeof (precmd),
" PROMPT_COMMAND='pwd>&%d;kill -STOP $$'\n", subshell_pipe[WRITE]);
" PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'pwd>&%d;kill -STOP $$'\n",
subshell_pipe[WRITE]);
break;
case ZSH: