diff options
| author | Clint Adams <clint@users.sourceforge.net> | 2005-01-11 18:24:51 +0000 |
|---|---|---|
| committer | Clint Adams <clint@users.sourceforge.net> | 2005-01-11 18:24:51 +0000 |
| commit | 8db6e42ecdcde1bd587bf03ac38b2044f944e239 (patch) | |
| tree | bc12adba0882547a01bb97e804307e14c6147f62 | |
| parent | d7e97230ff23ea923c112c9e023bc4c3c40bf872 (diff) | |
| download | zsh-8db6e42ecdcde1bd587bf03ac38b2044f944e239.tar.gz zsh-8db6e42ecdcde1bd587bf03ac38b2044f944e239.tar.xz zsh-8db6e42ecdcde1bd587bf03ac38b2044f944e239.zip | |
* 20657: Src/Zle/zle_tricky.c: sort completions partially based on LC_COLLATE setting.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Etc/FAQ.yo | 2 | ||||
| -rw-r--r-- | Src/Zle/zle_tricky.c | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index dffedd439..0633e5e8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-01-11 Clint Adams <clint@zsh.org> + * 20657: Src/Zle/zle_tricky.c: sort completions partially based on + LC_COLLATE setting. + * unposted: Completion/X/Command/_gnome-gv: move gnome-gv completion from C/U/C to C/X/C. diff --git a/Etc/FAQ.yo b/Etc/FAQ.yo index 618149259..c91fce18d 100644 --- a/Etc/FAQ.yo +++ b/Etc/FAQ.yo @@ -88,7 +88,7 @@ Chapter 2: How does zsh differ from...? 2.4. tcsh? 2.5. bash? 2.6. Shouldn't zsh be more/less like ksh/(t)csh? -2.7. What is zsh's support Unicode/UTF-8? +2.7. What is zsh's support for Unicode/UTF-8? Chapter 3: How to get various things to work 3.1. Why does `$var' where `var="foo bar"' not do what I expect? diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index 4fbf2b9c5..6d5723c39 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -1907,7 +1907,11 @@ strbpcmp(char **aa, char **bb) } } } +#ifndef HAVE_STRCOLL return (int)(*a - *b); +#else + return strcoll(a,b); +#endif } /* This is used to print the strings (e.g. explanations). * |