* net/rcirc.el (rcirc-sort-nicknames): Remove.

(rcirc-handler-366): Always sort nicknames.

2 files changed, 6 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d880905567c..9c5d7349381 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-03  Chong Yidong  <cyd@stupidchicken.com>
+
+        * net/rcirc.el (rcirc-sort-nicknames): Remove.
+        (rcirc-handler-366): Always sort nicknames.
+
 2010-06-03  Juanma Barranquero  <lekktu@gmail.com>
 
         * emacs-lisp/smie.el (comment-continue): Declare for byte-compiler.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index c45fdaaf8ad..7761bbc650e 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -281,12 +281,6 @@ Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT."
   :type 'hook
   :group 'rcirc)
 
-;; Does this really merit a config variable?
-(defcustom rcirc-sort-nicknames t
-  "If non-nil, sorts nickname listings."
-  :type 'boolean
-  :group 'rcirc)
-
 (defcustom rcirc-always-use-server-buffer-flag nil
   "Non-nil means messages without a channel target will go to the server buffer."
   :type 'boolean
@@ -2586,9 +2580,7 @@ keywords when no KEYWORD is given."
     (with-current-buffer buffer
       (rcirc-print process sender "NAMES" channel
                    (let ((content (buffer-substring (point-min) (point-max))))
-                     (if rcirc-sort-nicknames
-                         (rcirc-sort-nicknames-join content " ")
-                       content))))
+                     (rcirc-sort-nicknames-join content " "))))
     (kill-buffer buffer)))
 
 (defun rcirc-handler-433 (process sender args text)