linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-13 03:01:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Improve behavior inside Emacs, abbreviate master branch to M

Browse source 
* when branch is master, replace displayed branch name with M
 * enable colors only when on color capable terminal.
This commit is contained in:
alexg0 2009-12-12 00:51:31 -06:00
commit 812d81a807
2 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lib/appearance.zsh
View file

@ -1,15 +1,23 @@
# ls colors # ls colors
autoload colors; colors; autoload colors zsh/terminfo
export LSCOLORS="Gxfxcxdxbxegedabagacad"
#export LS_COLORS
# Enable ls colors # enable colors on color capable terminals
if [ "$DISABLE_LS_COLORS" != "true" ] if [[ "$terminfo[colors]" -ge 8 ]]; then
then colors
# Find the option for using colors in ls, depending on the version: Linux or BSD export LSCOLORS="Gxfxcxdxbxegedabagacad"
ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
# ls colors
if [ "$DISABLE_LS_COLORS" != "true" ]; then
# Find the option for using colors in ls, depending on the
# version: Linux or BSD
ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || \
alias ls='ls -G'
fi
fi fi
# disable zle inside emacs
[[ $TERM = 'dumb' && $EMACS = t ]] && unsetopt zle
#setopt no_beep #setopt no_beep
setopt auto_cd setopt auto_cd
setopt multios setopt multios
@ -35,4 +43,4 @@ ZSH_THEME_GIT_PROMPT_CLEAN="" # Text to display if the branch is c
setopt prompt_subst setopt prompt_subst
# Load the theme # Load the theme
source "$ZSH/themes/$ZSH_THEME.zsh-theme" source "$ZSH/themes/$ZSH_THEME.zsh-theme"

16
lib/git.zsh
View file

@ -1,7 +1,7 @@
# get the name of the branch we are on # get the name of the branch we are on
function git_prompt_info() { function git_prompt_info() {
ref=$(git symbolic-ref HEAD 2> /dev/null) || return branch=$(current_branch_for_display) || return
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX" echo "$ZSH_THEME_GIT_PROMPT_PREFIX${branch}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
} }
parse_git_dirty () { parse_git_dirty () {
@ -20,3 +20,15 @@ function current_branch() {
ref=$(git symbolic-ref HEAD 2> /dev/null) || return ref=$(git symbolic-ref HEAD 2> /dev/null) || return
echo ${ref#refs/heads/} echo ${ref#refs/heads/}
} }
#
# current branch for display. Abbreviate master to M.
# Other substitutions are possible.
# TODO:
# * allow to enable/disable translation of master to M.
# * enable argument to git_prompt_info control what is displayed
# (eg: M=535516, ala git-prompt project for bash)
function current_branch_for_display() {
branch=$(current_branch) || return
echo ${branch/master/M} # master abbreviated to M.
}