# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1275585747 14400
# Node ID 30e304f37b04ae98a19a5ab9a9b84eb2a1a2439c
# Parent  c3cbf94d10f1fe78d9ed8df8ec82dcf197eb94d3
* net/rcirc.el (rcirc-sort-nicknames): Remove.
(rcirc-handler-366): Always sort nicknames.

diff -r c3cbf94d10f1 -r 30e304f37b04 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Jun 03 18:59:29 2010 +0200
+++ b/lisp/ChangeLog	Thu Jun 03 13:22:27 2010 -0400
@@ -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 -r c3cbf94d10f1 -r 30e304f37b04 lisp/net/rcirc.el
--- a/lisp/net/rcirc.el	Thu Jun 03 18:59:29 2010 +0200
+++ b/lisp/net/rcirc.el	Thu Jun 03 13:22:27 2010 -0400
@@ -281,12 +281,6 @@
   :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 @@
     (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)