Merge remote-tracking branch 'origin/master'

Conflicts:
	environment.conf

autojump.conf

@@ -28,6 +28,7 @@ _autojump()
 complete -F _autojump j
 AUTOJUMP='{ (autojump -a "$(pwd -P)"&)>/dev/null 2>>${HOME}/.autojump_errors;} 2>/dev/null'
 if [[ ! $PROMPT_COMMAND =~ autojump ]]; then
+  PROMPT_COMMAND=`echo $PROMPT_COMMAND | sed 's/;\s*$//g'` # remove trailing ';'
   export PROMPT_COMMAND="${PROMPT_COMMAND:-:} && $AUTOJUMP"
 fi
 alias jumpstat="autojump --stat"

colors.conf

@@ -17,23 +17,23 @@ if [ "${TERM}" == "dumb" ]; then
   export COLOR_GRAY=''
   export COLOR_LIGHT_GRAY=''
 else
-  export COLOR_NONE=''
-  export COLOR_WHITE=''
-  export COLOR_BLACK=''
-  export COLOR_BLUE=''
-  export COLOR_LIGHT_BLUE=''
-  export COLOR_GREEN=''
-  export COLOR_LIGHT_GREEN=''
-  export COLOR_CYAN=''
-  export COLOR_LIGHT_CYAN=''
-  export COLOR_RED=''
-  export COLOR_LIGHT_RED=''
-  export COLOR_PURPLE=''
-  export COLOR_LIGHT_PURPLE=''
-  export COLOR_BROWN=''
-  export COLOR_YELLOW=''
-  export COLOR_GRAY=''
-  export COLOR_LIGHT_GRAY=''
+  export COLOR_NONE='\[\033[0m\]'
+  export COLOR_WHITE='\[\033[1;37m\]'
+  export COLOR_BLACK='\[\033[0;30m\]'
+  export COLOR_BLUE='\[\033[0;34m\]'
+  export COLOR_LIGHT_BLUE='\[\033[1;34m\]'
+  export COLOR_GREEN='\[\033[0;32m\]'
+  export COLOR_LIGHT_GREEN='\[\033[1;32m\]'
+  export COLOR_CYAN='\[\033[0;36m\]'
+  export COLOR_LIGHT_CYAN='\[\033[1;36m\]'
+  export COLOR_RED='\[\033[0;31m\]'
+  export COLOR_LIGHT_RED='\[\033[1;31m\]'
+  export COLOR_PURPLE='\[\033[0;35m\]'
+  export COLOR_LIGHT_PURPLE='\[\033[1;35m\]'
+  export COLOR_BROWN='\[\033[0;33m\]'
+  export COLOR_YELLOW='\[\033[1;33m\]'
+  export COLOR_GRAY='\[\033[1;30m\]'
+  export COLOR_LIGHT_GRAY='\[\033[0;37m\]'
 fi
 
 # From http://pastie.org/144897

dotfiles/screenrc

@@ -17,13 +17,13 @@ caption always
 # Meta-y to put copy buffer into OS X buffer
 bind y eval "writebuf $HOME/.screen.pbcopy" "exec /usr/bin/osascript -e 'tell application \"System Events\"' -e 'set the clipboard to (read posix file \"/$HOME/.screen.pbcopy\" as text)' -e 'end tell'"
 
-#terminfo and termcap for nice 256 color terminal
-# allow bold colors - necessary for some reason
-attrcolor b ".I"
-# tell screen how to set colors. AB = background, AF=foreground
-termcapinfo xterm "Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm"
-termcapinfo xterm-color "Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm"
-# erase background with current bg color
-defbce "on"
-
-term screen-256color
+# #terminfo and termcap for nice 256 color terminal
+# # allow bold colors - necessary for some reason
+# attrcolor b ".I"
+# # tell screen how to set colors. AB = background, AF=foreground
+# termcapinfo xterm "Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm"
+# termcapinfo xterm-color "Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm"
+# # erase background with current bg color
+# defbce "on"
+#
+# term screen-256color

environment.conf

@@ -73,4 +73,9 @@ function relative_time_since_last_commit {
   echo ${last_commit}
 }
 
-export PS1="\n"'$(show_time) $(prompt_color)'"\u@\h${COLOR_NONE}: ${COLOR_CYAN}\w${COLOR_NONE}"'$(show_exit_status)$(show_git_branch_and_status)'"\n"'$(show_rvm_prompt)'"> "
+# Set PS1 from a prompt command so we can do both dynamic and
+# non-printed sequences
+set_ps1() {
+  PS1="\n$(show_time) $(prompt_color)\u@\h${COLOR_NONE}: ${COLOR_CYAN}\w${COLOR_NONE}$(show_exit_status)$(show_git_branch_and_status)\n$(show_rvm_prompt)> "
+}
+PROMPT_COMMAND="${PROMPT_COMMAND:-:}; set_ps1"