From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Leo Newsgroups: gmane.emacs.bugs Subject: bug#6076: 23.1.96; [PATCH] rcirc-complete for nicks and commands Date: Tue, 04 May 2010 14:41:11 +0100 Organization: University of Cambridge Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1272981817 32183 80.91.229.12 (4 May 2010 14:03:37 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 4 May 2010 14:03:37 +0000 (UTC) To: bug-gnu-emacs@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue May 04 16:03:36 2010 connect(): No such file or directory Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1O9Iie-0001n2-Le for geb-bug-gnu-emacs@m.gmane.org; Tue, 04 May 2010 16:03:35 +0200 Original-Received: from localhost ([127.0.0.1]:38736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9Iib-0000Pi-Dn for geb-bug-gnu-emacs@m.gmane.org; Tue, 04 May 2010 10:03:25 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O9Ibk-0006b9-D6 for bug-gnu-emacs@gnu.org; Tue, 04 May 2010 09:56:20 -0400 Original-Received: from [140.186.70.92] (port=35060 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9Ibe-0006Z3-MJ for bug-gnu-emacs@gnu.org; Tue, 04 May 2010 09:56:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O9IbT-0005M8-Qe for bug-gnu-emacs@gnu.org; Tue, 04 May 2010 09:56:14 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:47470) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O9IbT-0005M3-Nw for bug-gnu-emacs@gnu.org; Tue, 04 May 2010 09:56:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1O9INt-00086o-Tv; Tue, 04 May 2010 09:42:01 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Leo Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 04 May 2010 13:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6076 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by submit@debbugs.gnu.org id=B.127298050231162 (code B ref -1); Tue, 04 May 2010 13:42:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 4 May 2010 13:41:42 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O9INZ-00086Z-Um for submit@debbugs.gnu.org; Tue, 04 May 2010 09:41:42 -0400 Original-Received: from mail.gnu.org ([199.232.76.166] helo=mx10.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O9INY-00086T-Br for submit@debbugs.gnu.org; Tue, 04 May 2010 09:41:41 -0400 Original-Received: from lists.gnu.org ([199.232.76.165]:45573) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1O9INT-0007lX-Ji for submit@debbugs.gnu.org; Tue, 04 May 2010 09:41:35 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O9INS-0006Di-Oh for bug-gnu-emacs@gnu.org; Tue, 04 May 2010 09:41:34 -0400 Original-Received: from [140.186.70.92] (port=44578 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9INR-0006Cm-Cw for bug-gnu-emacs@gnu.org; Tue, 04 May 2010 09:41:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O9INP-00020a-UD for bug-gnu-emacs@gnu.org; Tue, 04 May 2010 09:41:33 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:57900) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O9INP-000209-Oc for bug-gnu-emacs@gnu.org; Tue, 04 May 2010 09:41:31 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1O9INI-0005GN-3S for bug-gnu-emacs@gnu.org; Tue, 04 May 2010 15:41:24 +0200 Original-Received: from smaug.linux.pwf.cam.ac.uk ([193.60.95.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 04 May 2010 15:41:24 +0200 Original-Received: from sdl.web by smaug.linux.pwf.cam.ac.uk with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 04 May 2010 15:41:24 +0200 X-Injected-Via-Gmane: http://gmane.org/ connect(): No such file or directory Original-Lines: 30 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: smaug.linux.pwf.cam.ac.uk User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) Cancel-Lock: sha1:kfrLVxiEJTtRt7sisUj/s3GzcvQ= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Tue, 04 May 2010 09:42:01 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:36683 Archived-At: On 2010-05-02 10:01 +0100, Leo wrote: > Please review the attached patch instead which fixed compiler warnings > in the previous patch. > > Thanks. > Leo This patch make sures commands defined by rcirc are seen first before server commands. Leo diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 2e5e7ac..9b58112 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -800,9 +800,9 @@ IRC command completion is performed only if '/' is the first input char." (if (and (zerop rcirc-completion-start-offset) (char-after rcirc-prompt-end-marker) (= (char-after rcirc-prompt-end-marker) ?/)) - (sort (delete-dups (append rcirc-client-commands - (copy-sequence rcirc-server-commands))) - 'string-lessp) + (delete-dups + (append (sort (copy-sequence rcirc-client-commands) 'string-lessp) + (sort (copy-sequence rcirc-server-commands) 'string-lessp))) (mapcar (lambda (x) (cons x nil)) (rcirc-channel-nicks (rcirc-buffer-process) rcirc-target)))))))