summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2001-12-17 14:06:27 +0000
committerClint Adams <clint@users.sourceforge.net>2001-12-17 14:06:27 +0000
commit8659013fb8c76fdaac1baa43b09393ec10948a93 (patch)
tree54c54162618672f9c3ed900978d0e641f40b2806
parent13ab7280aa553e2398b8aab8a9e66d32f43599ce (diff)
downloadzsh-8659013fb8c76fdaac1baa43b09393ec10948a93.tar.gz
zsh-8659013fb8c76fdaac1baa43b09393ec10948a93.zip
16357: change (n) to (u) so (n) can be reserved. for numeric sorting.
-rw-r--r--ChangeLog6
-rw-r--r--Doc/Zsh/expn.yo6
-rw-r--r--Src/subst.c2
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index dc8887f29..38a42ee70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-17 Clint Adams <clint@zsh.org>
+
+ * 16357: Doc/Zsh/expn.yo, Src/subst.c:
+ change (n) to (u) so (n) can be reserved.
+ for numeric sorting.
+
2001-12-17 Oliver Kiddle <opk@zsh.org>
* 16351: Src/params.c: fix bug in parameter unset code
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index c3fbd7cfc..f58c61145 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -727,6 +727,9 @@ for special parameters defined by the shell
)
enditem()
)
+item(tt(u))(
+Expand only the first occurrence of each unique word.
+)
item(tt(U))(
Convert all letters in the result to upper case.
)
@@ -761,9 +764,6 @@ access single words in the result, one has to use nested expansions as
in `tt(${${(z)foo}[2]})'. Likewise, to remove the quotes in the
resulting words one would do: `tt(${(Q)${(z)foo}})'.
)
-item(tt(n))(
-Expand only the first occurrence of each unique word.
-)
enditem()
The following flags (except tt(p)) are followed by one or more arguments
diff --git a/Src/subst.c b/Src/subst.c
index f8ce51ae9..14ad37386 100644
--- a/Src/subst.c
+++ b/Src/subst.c
@@ -997,7 +997,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub)
shsplit = 1;
break;
- case 'n':
+ case 'u':
unique = 1;
break;