summary refs log tree commit diff
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@gmail.com>2015-09-28 02:18:49 +0200
committerMikael Magnusson <mikachu@gmail.com>2015-09-28 02:24:54 +0200
commitd85a1fcd888198d0212d7bec615751e8fe715fdd (patch)
tree709724da2621a85a023296d1a27ed02fc6e7a171
parent2654cb43f63349cff06b3dd26932dd76f53aed4c (diff)
downloadzsh-d85a1fcd888198d0212d7bec615751e8fe715fdd.tar.gz
zsh-d85a1fcd888198d0212d7bec615751e8fe715fdd.tar.xz
zsh-d85a1fcd888198d0212d7bec615751e8fe715fdd.zip
unposted: Fix broken case condition and "qualifer" typo
-rw-r--r--ChangeLog15
-rw-r--r--Completion/Zsh/Context/_brace_parameter6
-rw-r--r--Completion/Zsh/Type/_delimiters2
-rw-r--r--Completion/Zsh/Type/_globquals2
-rw-r--r--Functions/Calendar/age2
5 files changed, 16 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 2cd07ffa3..7af8a07c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,17 @@
+2015-09-28  Mikael Magnusson  <mikachu@gmail.com>
+
+	* unposted: Completion/Zsh/Context/_brace_parameter,
+	Completion/Zsh/Type/_delimiters, Completion/Zsh/Type/_globquals,
+	Functions/Calendar/age: Fix broken case condition and "qualifer"
+	typo
+
 2015-09-27  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
-	* 36651: Doc/Zsh/options.yo Src/exec.c Src/math.c
+	* 36651: Doc/Zsh/options.yo, Src/exec.c, Src/math.c,
 	Test/E01options.ztst: WARN_CREATE_GLOBAL += math expressions
 
-2015-09-27  Matthew Martin  <phy1729@gmail.com>
-
-	* 36653: Completion/Unix/Command/_user_admin: OpenBSD's usermod
-	has no -a flag
+	* Matthew Martin: 36653: Completion/Unix/Command/_user_admin:
+	OpenBSD's usermod has no -a flag
 
 2015-09-27  Barton E. Schaefer  <schaefer@zsh.org>
 
diff --git a/Completion/Zsh/Context/_brace_parameter b/Completion/Zsh/Context/_brace_parameter
index 9eb3465ae..e77d4c58b 100644
--- a/Completion/Zsh/Context/_brace_parameter
+++ b/Completion/Zsh/Context/_brace_parameter
@@ -31,7 +31,7 @@ if [[ $PREFIX = *'${('[^\)]# ]]; then
       ([gIjsZ_])
       # Single delimited argument.
       if [[ -z $PREFIX ]]; then
-	_delimiters qualifer-$char
+	_delimiters qualifier-$char
 	return
       elif ! _globqual_delims; then
 	# still completing argument
@@ -46,7 +46,7 @@ if [[ $PREFIX = *'${('[^\)]# ]]; then
 	  _message 'integer expression'
 	  ;;
 
-	  (js)
+	  ([js])
 	  _message "separator"
 	  ;;
 
@@ -71,7 +71,7 @@ if [[ $PREFIX = *'${('[^\)]# ]]; then
       ([lr])
       # One compulsory argument, two optional.
       if [[ -z $PREFIX ]]; then
-	_delimiters qualifer-$char
+	_delimiters qualifier-$char
 	return
       else
 	delim=$PREFIX[1]
diff --git a/Completion/Zsh/Type/_delimiters b/Completion/Zsh/Type/_delimiters
index bb5bba8d0..d98d5a766 100644
--- a/Completion/Zsh/Type/_delimiters
+++ b/Completion/Zsh/Type/_delimiters
@@ -1,6 +1,6 @@
 #autoload
 
-# Simple function to offer delimiters for modifiers and qualifers.
+# Simple function to offer delimiters for modifiers and qualifiers.
 # Single argument is tag to use.
 
 local expl
diff --git a/Completion/Zsh/Type/_globquals b/Completion/Zsh/Type/_globquals
index 5cdb8f7c4..2523eb333 100644
--- a/Completion/Zsh/Type/_globquals
+++ b/Completion/Zsh/Type/_globquals
@@ -47,7 +47,7 @@ while [[ -n $PREFIX ]]; do
     (e)
     # complete/skip delimited command line
     if [[ -z $PREFIX ]]; then
-      _delimiters qualifer-e
+      _delimiters qualifier-e
       return
     elif ! _globqual_delims; then
       # still completing command to eval
diff --git a/Functions/Calendar/age b/Functions/Calendar/age
index 17cf4d13e..50755d610 100644
--- a/Functions/Calendar/age
+++ b/Functions/Calendar/age
@@ -1,4 +1,4 @@
-# Match the age of a file, for use as a glob qualifer.  Can
+# Match the age of a file, for use as a glob qualifier.  Can
 # take one or two arguments, which can be supplied by one of two
 # ways (always the same for both arguments):
 #