diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2009-10-18 19:47:29 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2009-10-18 19:47:29 +0000 |
| commit | a252b6110d84fd64d72be435b9370e0f241a1128 (patch) | |
| tree | a0434df59a17b8b5591c620dc4cfc6bffd61c97c | |
| parent | 8ed0fad414daa81c7f7232139e3022b46106437f (diff) | |
| download | zsh-a252b6110d84fd64d72be435b9370e0f241a1128.tar.gz zsh-a252b6110d84fd64d72be435b9370e0f241a1128.tar.xz zsh-a252b6110d84fd64d72be435b9370e0f241a1128.zip | |
Frank Terbeck: 27309: VCS_INFO doc
Holger Weiss: 27310: typo in matcher doc Jesse Weinstein: 27310: redundant diff option
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Completion/Unix/Type/_diff_options | 1 | ||||
| -rw-r--r-- | Doc/Zsh/compsys.yo | 2 | ||||
| -rw-r--r-- | Doc/Zsh/contrib.yo | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index eed7267ca..8815b74df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-10-18 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * Jesse Weinstein: 27311: Completion/Unix/Type/_diff_options: + remove redundant line. + + * Holger Weiss: 27310: Doc/Zsh/compsys.yo: typo. + + * Frank Terbeck: 27309: Doc/Zsh/contrib.yo: improve context + in VCS_Info docs. + 2009-10-04 Peter Stephenson <p.w.stephenson@ntlworld.com> * 27308, based on 27305 from Edgar Merino: @@ -12243,5 +12253,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4791 $ +* $Revision: 1.4792 $ ***************************************************** diff --git a/Completion/Unix/Type/_diff_options b/Completion/Unix/Type/_diff_options index a83042e88..472838cda 100644 --- a/Completion/Unix/Type/_diff_options +++ b/Completion/Unix/Type/_diff_options @@ -47,7 +47,6 @@ if _pick_variant -c $cmd gnu=GNU unix -v; then '(--ignore-file-name-case)--no-ignore-file-name-case[consider case when comparing file names]' \ '(-E --ignore-tab-expansion)'{-E,--ignore-tab-expansion}'[ignore changes due to tab expansion]' \ '(-b --ignore-space-change)'{-b,--ignore-space-change}'[ignore changes in the amount of white space]' \ - '(--ignore-space-change)-b[ignore changes in the amount of white space]' \ '(--ignore-all-space -w)'{--ignore-all-space,-w}'[ignore all white space]' \ '(-B --ignore-blank-lines)'{-B,--ignore-blank-lines}'[ignore lines that are all blank]' \ '(-I --ignore-matching-lines)'{-I+,--ignore-matching-lines=}'[ignore lines that match regex]:line exclusion regex:' \ diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo index 96a5f7657..22ed88db3 100644 --- a/Doc/Zsh/compsys.yo +++ b/Doc/Zsh/compsys.yo @@ -2010,7 +2010,7 @@ specification is prefixed with tt(+), it is added to the existing list. Hence it is possible to create increasingly general specifications without repetition: -example(zstyle ':completion:*' matcher-list '' '+m{a-Z}={A-Z}' '+m{A-Z}={a-z}') +example(zstyle ':completion:*' matcher-list '' '+m{a-z}={A-Z}' '+m{A-Z}={a-z}') It is possible to create match specifications valid for particular completers by using the third field of the context. For example, to diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo index 51a8e83bf..858128ab8 100644 --- a/Doc/Zsh/contrib.yo +++ b/Doc/Zsh/contrib.yo @@ -777,7 +777,7 @@ Here is how to print the vcs information as a command (not in a prompt): example(alias vcsi='vcs_info command; vcs_info_lastmsg') This way, you can even define different formats for output via -tt(vcs_info_lastmsg) in the ':vcs_info:formats:command:*' namespace. +tt(vcs_info_lastmsg) in the ':vcs_info:*:command:*' namespace. texinode(Prompt Themes)(ZLE Functions)(Version Control Information)(User Contributions) |