From cbb4a67560352f7d9535749324208c8578ff5a5a Mon Sep 17 00:00:00 2001 From: William Schlieper <schlieper@unc.edu> Date: Sun, 3 Aug 2008 20:35:23 -0400 Subject: [PATCH] irc.ui: Userlist sorting now uses Unicode Collation Algorithm --- extra/irc/ui/ui.factor | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/extra/irc/ui/ui.factor b/extra/irc/ui/ui.factor index e9b098a67c..f712e17afe 100755 --- a/extra/irc/ui/ui.factor +++ b/extra/irc/ui/ui.factor @@ -3,7 +3,7 @@ USING: accessors kernel threads combinators concurrency.mailboxes sequences strings hashtables splitting fry assocs hashtables colors - sorting qualified unicode.case math.order + sorting qualified unicode.collation math.order ui ui.gadgets ui.gadgets.panes ui.gadgets.editors ui.gadgets.scrollers ui.commands ui.gadgets.frames ui.gestures ui.gadgets.tabs ui.gadgets.grids ui.gadgets.packs ui.gadgets.labels @@ -125,11 +125,8 @@ M: irc-message write-irc GENERIC: handle-inbox ( tab message -- ) -: lower-<=> ( x y -- <=> ) - [ >lower ] bi@ <=> ; - : value-labels ( assoc val -- seq ) - '[ nip , = ] assoc-filter keys [ lower-<=> ] sort [ <label> ] map ; + '[ nip , = ] assoc-filter keys [ string<=> ] sort [ <label> ] map ; : add-gadget-color ( pack seq color -- pack ) '[ , >>color add-gadget ] each ;