summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wischnowsky <wischnow@users.sourceforge.net>2000-04-14 12:28:04 +0000
committerSven Wischnowsky <wischnow@users.sourceforge.net>2000-04-14 12:28:04 +0000
commit4ea0d964757df77b9771d56cad5d6f4e9dcbacd1 (patch)
tree539b7d520b574f3b14ab0dc162d5b9077e84c7d4
parent2295c59fcb4f1e31ef05555318bf3b3b4a2df8f9 (diff)
downloadzsh-4ea0d964757df77b9771d56cad5d6f4e9dcbacd1.tar.gz
zsh-4ea0d964757df77b9771d56cad5d6f4e9dcbacd1.zip
missing `+'s in _diffoptions (10760)
-rw-r--r--ChangeLog4
-rw-r--r--Completion/User/_diff_options18
2 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 78fbba1ed..a7c142ce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-14 Sven Wischnowsky <wischnow@informatik.hu-berlin.de>
+
+ * 10760: Completion/User/_diff_options: just some missing `+'s
+
2000-04-14 Peter Stephenson <pws@cambridgesiliconradio.com>
* 10756: Doc/Zsh/expn.yo, Src/glob.c, Src/pattern.c, Src/zsh.h:
diff --git a/Completion/User/_diff_options b/Completion/User/_diff_options
index c692142fd..50ab4fde6 100644
--- a/Completion/User/_diff_options
+++ b/Completion/User/_diff_options
@@ -58,17 +58,17 @@ if [[ -n "$_is_gnu[$cmd]" ]]; then
'(-B)--ignore-blank-lines[ignore lines that are all blank]' \
'(--ignore-blank-lines)-B[ignore lines that are all blank]' \
'(-I)--ignore-matching-lines=[ignore lines that match regex]:line exclusion regex:' \
- '(--ignore-matching-lines)-I[ignore lines that match regex]:line exclusion regex:' \
+ '(--ignore-matching-lines)-I+[ignore lines that match regex]:line exclusion regex:' \
'(-a)--text[treat all files as text]' \
'(--text)-a[treat all files as text]' \
"($of $oss)--context=[context diff]::number of lines of copied context:" \
- "($of $oss)-C[output a context diff]:number of lines of copied context:" \
+ "($of $oss)-C+[output a context diff]:number of lines of copied context:" \
"($of $oss)-c[output a context diff]" \
"($of $oss)--unified=[output a unified diff]::number of lines of unified context:" \
- "($of $oss)-U[output a unified diff]:number of lines of unified context:" \
+ "($of $oss)-U+[output a unified diff]:number of lines of unified context:" \
"($of $oss)-u[output a unified diff]" \
"($ofwuc $oss -L)--label[set label to use instead of file name]:label:" \
- "($ofwuc $oss --label)-L[set label to use instead of file name]:label:" \
+ "($ofwuc $oss --label)-L+[set label to use instead of file name]:label:" \
"($ofwuc $oss -p)--show-c-function[show C function of each change]" \
"($ofwuc $oss --show-c-function)-p[show C function of each change]" \
"($ofwuc $oss -F)--show-function-line=[show the most recent line matching regex]:regex:" \
@@ -82,8 +82,8 @@ if [[ -n "$_is_gnu[$cmd]" ]]; then
"($of $ouc $oss)-n[RCS format diff]" \
"($of $ouc)--side-by-side[output in two columns]" \
"($of $ouc)-y[output in two columns]" \
- "($ofwy $ouc -W)--width[set size of line]:number of characters per line:" \
- "($ofwy $ouc --width)-W[set size of line]:number of characters per line:" \
+ "($ofwy $ouc -W)--width=[set size of line]:number of characters per line:" \
+ "($ofwy $ouc --width)-W+[set size of line]:number of characters per line:" \
"($ofwy $ouc)--left-column[output only left column of common lines]" \
"($ofwy $ouc)--suppress-common-lines[do not output common lines]" \
"($ofwg $ouc $oss)--old-group-format=[set old group format]:old group format:" \
@@ -109,11 +109,11 @@ if [[ -n "$_is_gnu[$cmd]" ]]; then
'(-s)--report-identical-files[report when two files are the same]' \
'(--report-identical-files)-s[report when two files are the same]' \
'(-x)--exclude=[exclude files matching pattern]:exclusion pattern:' \
- '(--exclude)-x[exclude files matching pattern]:exclusion pattern:' \
+ '(--exclude)-x+[exclude files matching pattern]:exclusion pattern:' \
'(-X)--exclude-from=[exclude files matching pattern in file]:exclude file:_files' \
- '(--exclude-from)-X[exclude files matching pattern in file]:exclude file:_files' \
+ '(--exclude-from)-X+[exclude files matching pattern in file]:exclude file:_files' \
'(-S)--starting-file=[set first file in comparison]:start with file:_files' \
- '(--starting-file)-S=[set first file in comparison]:start with file:_files' \
+ '(--starting-file)-S+[set first file in comparison]:start with file:_files' \
'--horizon-lines=[set number of lines to keep in prefix and suffix]:number of horizon lines:' \
'(-d)--mininal[try to find a smaller set of changes]' \
'(--mininal)-d[try to find a smaller set of changes]' \