Subject: bug#6076: 23.1.96; [PATCH] rcirc-complete for nicks and commands

From: Leo <[email-masked]>
Date: Mon, 06 Sep 2010 18:52:25 +0100

On 2010-09-04 22:44 +0100, Stefan Monnier wrote:
>> I have recreated the patch against emacs-23 as suggested. I have also
>> briefly tested it. Seems to work as expected. M-TAB in rcirc-mode now
>> uses the new completion at point interface.
>
> Looks goot to me,
>
>
>         Stefan

I have been using it over the weekend and nothing abnormal found. But
maybe apply the following minor tweaks on top of the previous patch.

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index cade679..7a43678 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -794,11 +794,12 @@ The list is updated automatically by `defun-rcirc-command'.")
 		(if (re-search-backward " " rcirc-prompt-end-marker t)
 		    (1+ (point))
 		  rcirc-prompt-end-marker)))
-	 (table (if (and (eq beg rcirc-prompt-end-marker)
+	 (table (if (and (= beg rcirc-prompt-end-marker)
 			 (eq (char-after beg) ?/))
 		    (delete-dups
-		     (append (sort (copy-sequence rcirc-client-commands) 'string-lessp)
-			     (sort (copy-sequence rcirc-server-commands) 'string-lessp)))
+		     (nconc
+		      (sort (copy-sequence rcirc-client-commands) 'string-lessp)
+		      (sort (copy-sequence rcirc-server-commands) 'string-lessp)))
 		  (rcirc-channel-nicks (rcirc-buffer-process) rcirc-target))))
     (list beg (point) table)))

  Leo