summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2006-07-25 09:25:26 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2006-07-25 09:25:26 +0000
commitb9bf52d1fc750633189c3d25182edc95ffdbcb19 (patch)
treef33f494315b23b32bc75e12378c9dc6eb503fd2f
parent50e9ab122b5022d8e90facb6ca01b32996ea16d1 (diff)
downloadzsh-b9bf52d1fc750633189c3d25182edc95ffdbcb19.tar.gz
zsh-b9bf52d1fc750633189c3d25182edc95ffdbcb19.zip
fix typos in 22556
-rw-r--r--ChangeLog5
-rw-r--r--Src/pattern.c2
-rw-r--r--Src/utils.c4
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d5c8e7c7..62f8cec19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-25 Peter Stephenson <pws@csr.com>
+
+ * unposted: Src/pattern.c, Src/utils.c: minor typos in
+ 22556 found when MULTIBYTE_SUPPORT is not defined.
+
2006-07-24 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 22556: Doc/Zsh/builtins.yo, Functions/Zle/insert-composed-char,
diff --git a/Src/pattern.c b/Src/pattern.c
index 39c146b86..24077768d 100644
--- a/Src/pattern.c
+++ b/Src/pattern.c
@@ -3204,7 +3204,7 @@ static int patrepeat(Upat p, char *charstart)
break;
#else
if (patmatchrange(opnd, CHARREF(scan, patinend)) ^
- P_OP(p) == P_ANYOF)
+ (P_OP(p) == P_ANYOF))
break;
#endif
charstart[scan-patinput] = 1;
diff --git a/Src/utils.c b/Src/utils.c
index 6ea254a4d..0574431d0 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -3980,12 +3980,14 @@ mb_metastrlen(char *ptr)
#else
/* Simple replacement for mb_metacharlenconv */
+
+/**/
int
metacharlenconv(char *x, int *c)
{
if (*x == Meta) {
if (c)
- *c == STOUC(x[1]);
+ *c = STOUC(x[1]) ^ 32;
return 2;
}
if (c)