From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ryan Yeske Newsgroups: gmane.emacs.devel Subject: Re: rcirc update Date: Fri, 15 Jun 2007 20:02:26 -0700 Message-ID: <87r6oca9fh.fsf@owie.lan> References: <871wgld7nz.fsf@owie.lan> <87r6ofppg7.fsf@stupidchicken.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1181963008 31676 80.91.229.12 (16 Jun 2007 03:03:28 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 16 Jun 2007 03:03:28 +0000 (UTC) Cc: cyd@stupidchicken.com, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jun 16 05:03:26 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1HzOZR-0007xX-32 for ged-emacs-devel@m.gmane.org; Sat, 16 Jun 2007 05:03:25 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HzOZQ-00020W-Jj for ged-emacs-devel@m.gmane.org; Fri, 15 Jun 2007 23:03:24 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HzOZN-00020H-7v for emacs-devel@gnu.org; Fri, 15 Jun 2007 23:03:21 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HzOZL-000205-PD for emacs-devel@gnu.org; Fri, 15 Jun 2007 23:03:19 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HzOZL-000202-Ii for emacs-devel@gnu.org; Fri, 15 Jun 2007 23:03:19 -0400 Original-Received: from mail.tor.primus.ca ([216.254.136.21] helo=mail-06.primus.ca) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HzOZL-0000zn-0B for emacs-devel@gnu.org; Fri, 15 Jun 2007 23:03:19 -0400 Original-Received: from [209.90.176.154] (helo=owie.lan) by mail-06.primus.ca with esmtp (Exim 4.63) (envelope-from ) id 1HzOZJ-00065F-1s; Fri, 15 Jun 2007 23:03:18 -0400 In-Reply-To: (message from Stefan Monnier on Wed, 13 Jun 2007 17:17:38 -0400) X-detected-kernel: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:73039 Archived-At: Stefan Monnier writes: >> This patch does not apply cleanly to the version of rcirc.el in Emacs >> CVS; I get an error "**** context mangled in hunk at line 1619". Hmm, not sure why that would have happened, I just inserted the *vc-diff* buffer into a *mail* buffer and sent it. > This error usually means that something messed up the format of the patch. > Typically the MTA/MUA or some copy&paste has turned lines of whitespace > into empty lines, or something like that. > > In any case, his patch worked just fine for me, so I installed it. Thanks Stefan. I have a couple small follow up fixes to those changes: 2007-06-15 Ryan Yeske * rcirc.el (rcirc-connections): Fix default setting. (rcirc-clear-activity): Make sure RCIRC-ACTIVITY isn't modified. (rcirc-print): Never ignore messages from ourself. *** rcirc.el 07 Jun 2007 10:39:22 -0700 1.177 --- rcirc.el 14 Jun 2007 21:25:43 -0700 *************** *** 56,62 **** :group 'applications) (defcustom rcirc-connections ! '(("irc.freenode.net" :channels ("#rcirc"))) "An alist of IRC connections to establish when running `rcirc'. Each element looks like (SERVER-NAME PARAMETERS). --- 56,62 ---- :group 'applications) (defcustom rcirc-connections ! '(("irc.freenode.net" channels ("#rcirc"))) "An alist of IRC connections to establish when running `rcirc'. Each element looks like (SERVER-NAME PARAMETERS). *************** *** 64,72 **** to. PARAMETERS is a plist of optional connection parameters. Valid ! properties are: nick (a string), port (number or string), ! user-name (string), full-name (string), and channels (list of ! strings)." :type '(alist :key-type string :value-type (plist :options ((nick string) (port integer) --- 64,76 ---- to. PARAMETERS is a plist of optional connection parameters. Valid ! properties are: ! ! NICK (a string), ! PORT (number or string), ! USER-NAME (string), ! FULL-NAME (string), and ! CHANNELS (list of strings)." :type '(alist :key-type string :value-type (plist :options ((nick string) (port integer) *************** *** 590,596 **** process)))))) (defun rcirc-delete-process (process) - (message "delete process %S" process) (delete-process process)) (defvar rcirc-trap-errors-flag t) --- 594,599 ---- *************** *** 1262,1272 **** Format based on SENDER and RESPONSE. If ACTIVITY is non-nil, record activity." (or text (setq text "")) ! (unless (or (member sender rcirc-ignore-list) ! (member (with-syntax-table rcirc-nick-syntax-table ! (when (string-match "^\\([^/]\\w*\\)[:,]" text) ! (match-string 1 text))) ! rcirc-ignore-list)) (let* ((buffer (rcirc-target-buffer process sender response target text)) (inhibit-read-only t)) (with-current-buffer buffer --- 1265,1276 ---- Format based on SENDER and RESPONSE. If ACTIVITY is non-nil, record activity." (or text (setq text "")) ! (unless (and (or (member sender rcirc-ignore-list) ! (member (with-syntax-table rcirc-nick-syntax-table ! (when (string-match "^\\([^/]\\w*\\)[:,]" text) ! (match-string 1 text))) ! rcirc-ignore-list)) ! (not (string= sender (rcirc-nick process)))) (let* ((buffer (rcirc-target-buffer process sender response target text)) (inhibit-read-only t)) (with-current-buffer buffer *************** *** 1635,1641 **** (defun rcirc-clear-activity (buffer) "Clear the BUFFER activity." ! (setq rcirc-activity (delete buffer rcirc-activity)) (with-current-buffer buffer (setq rcirc-activity-types nil))) --- 1639,1645 ---- (defun rcirc-clear-activity (buffer) "Clear the BUFFER activity." ! (setq rcirc-activity (remove buffer rcirc-activity)) (with-current-buffer buffer (setq rcirc-activity-types nil))) -- Ryan