From 44ea155d1327710cc6bbf7d83c1b060f19c9ff9d Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 3 Jun 2010 11:58:20 -0400 Subject: [PATCH] * net/rcirc.el (rcirc-nickname<, rcirc-sort-nicknames-join): Doc fix. --- lisp/ChangeLog | 5 +++++ lisp/net/rcirc.el | 18 ++++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a74c3999b42..dc4a5e21192 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-06-03 Chong Yidong + + * net/rcirc.el (rcirc-nickname<, rcirc-sort-nicknames-join): Doc + fix. + 2010-06-03 Stefan Monnier * net/rcirc.el (rcirc-sort-nicknames): Change default. diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 0317cac3219..c45fdaaf8ad 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -1657,13 +1657,10 @@ if NICK is also on `rcirc-ignore-list-automatic'." (delete nick rcirc-ignore-list)))) (defun rcirc-nickname< (s1 s2) - "Compares two IRC nicknames. Operator nicknames (@) are -considered less than voiced nicknames (+). Any other nicknames -are greater than voiced nicknames. - -Returns t if S1 is less than S2, otherwise nil. - -The comparison is case-insensitive." + "Return t if IRC nickname S1 is less than S2, and nil otherwise. +Operator nicknames (@) are considered less than voiced +nicknames (+). Any other nicknames are greater than voiced +nicknames. The comparison is case-insensitive." (setq s1 (downcase s1) s2 (downcase s2)) (let* ((s1-op (eq ?@ (string-to-char s1))) @@ -1677,12 +1674,9 @@ The comparison is case-insensitive." (string< s1 s2))))) (defun rcirc-sort-nicknames-join (input sep) - "Takes a string of nicknames and returns the string with the -nicknames sorted. - + "Return a string of sorted nicknames. INPUT is a string containing nicknames separated by SEP. - -This function is non-destructive, sorting a copy of the input." +This function does not alter the INPUT string." (let* ((parts (split-string input sep t)) (sorted (sort parts 'rcirc-nickname<))) (mapconcat 'identity sorted sep))) -- 2.39.2