diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Doc/Zsh/contrib.yo | 4 | ||||
| -rw-r--r-- | Functions/VCS_Info/VCS_INFO_formats | 4 | ||||
| -rw-r--r-- | Misc/vcs_info-examples | 6 |
4 files changed, 9 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 1290a72be..26c1e147a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ * Simon Ruderich: 27954: Doc/Zsh/contrib.yo, Misc/vcs_info-examples: vcs_info: more minor documentation fixes. + * Simon Ruderich: 27953: Doc/Zsh/contrib.yo, Misc/vcs_info-examples, + Functions/VCS_Info/VCS_INFO_formats: vcs_info: changed default formats + and actionformats + 2010-05-12 Peter Stephenson <pws@csr.com> * unposted: Doc/Zsh/params.yo, Src/Modules/zutil.c: fix typo @@ -13138,5 +13142,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4978 $ +* $Revision: 1.4979 $ ***************************************************** diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo index 270862557..665f60c3b 100644 --- a/Doc/Zsh/contrib.yo +++ b/Doc/Zsh/contrib.yo @@ -656,8 +656,8 @@ enditem() The default values for these styles in all contexts are: startsitem() -sitem(tt(formats))(" (%s)-[%b]-") -sitem(tt(actionformats))(" (%s)-[%b|%a]-") +sitem(tt(formats))(" (%s)-[%b]%u%c-") +sitem(tt(actionformats))(" (%s)-[%b|%a]%u%c-") sitem(tt(branchformat))("%b:%r" (for bzr, svn, svk and hg)) sitem(tt(nvcsformats))("") sitem(tt(hgrevformat))("%r:%h") diff --git a/Functions/VCS_Info/VCS_INFO_formats b/Functions/VCS_Info/VCS_INFO_formats index 469efa7d4..138091944 100644 --- a/Functions/VCS_Info/VCS_INFO_formats +++ b/Functions/VCS_Info/VCS_INFO_formats @@ -51,10 +51,10 @@ VCS_INFO_hook 'post-backend' if [[ -n ${hook_com[action]} ]] ; then zstyle -a ":vcs_info:${vcs}:${usercontext}:${rrn}" actionformats msgs - (( ${#msgs} < 1 )) && msgs[1]=' (%s)-[%b|%a]-' + (( ${#msgs} < 1 )) && msgs[1]=' (%s)-[%b|%a]%u%c-' else zstyle -a ":vcs_info:${vcs}:${usercontext}:${rrn}" formats msgs - (( ${#msgs} < 1 )) && msgs[1]=' (%s)-[%b]-' + (( ${#msgs} < 1 )) && msgs[1]=' (%s)-[%b]%u%c-' fi if [[ -n ${hook_com[staged]} ]] ; then diff --git a/Misc/vcs_info-examples b/Misc/vcs_info-examples index e0f531b10..742ba3418 100644 --- a/Misc/vcs_info-examples +++ b/Misc/vcs_info-examples @@ -207,12 +207,6 @@ autoload -Uz vcs_info zstyle ':vcs_info:*' check-for-changes true zstyle ':vcs_info:*' get-revision true -# Improve default formats/actionformats to display staged (%c) and -# unstaged (%u) changes. You can change the displayed string with the -# 'unstagedstr' and 'stagedstr' settings. -zstyle ':vcs_info:*' formats " (%s)-[%b]%u%c-" -zstyle ':vcs_info:*' actionformats " (%s)-[%b|%a]%u%c-" - # Default to running vcs_info. If possible we prevent running it later for # speed reasons. If set to a non empty value vcs_info is run. |