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 bug Date: Tue, 05 Sep 2006 14:27:45 -0700 Message-ID: <87mz9eknqm.fsf@cut.bc.hsia.telus.net> References: <20060904135111.7ADB544005@Psilocybe.Update.UU.SE> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1157491705 2677 80.91.229.2 (5 Sep 2006 21:28:25 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 5 Sep 2006 21:28:25 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Sep 05 23:28:23 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1GKiSs-0002Zk-H2 for ged-emacs-devel@m.gmane.org; Tue, 05 Sep 2006 23:28:15 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GKiSr-00057f-TU for ged-emacs-devel@m.gmane.org; Tue, 05 Sep 2006 17:28:13 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1GKiSc-00053u-5Q for emacs-devel@gnu.org; Tue, 05 Sep 2006 17:27:58 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1GKiSX-0004zc-Ex for emacs-devel@gnu.org; Tue, 05 Sep 2006 17:27:55 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GKiSX-0004zX-AM for emacs-devel@gnu.org; Tue, 05 Sep 2006 17:27:53 -0400 Original-Received: from [204.209.205.55] (helo=defout.telus.net) by monty-python.gnu.org with esmtp (Exim 4.52) id 1GKiST-0005me-Dw; Tue, 05 Sep 2006 17:27:49 -0400 Original-Received: from priv-edmwaa06.telusplanet.net ([207.6.239.189]) by priv-edmwes50.telusplanet.net (InterMail vM.7.05.01.01 201-2174-106-103-20060222) with ESMTP id <20060905212747.YUCH11902.priv-edmwes50.telusplanet.net@priv-edmwaa06.telusplanet.net>; Tue, 5 Sep 2006 15:27:47 -0600 Original-Received: from cut.bc.hsia.telus.net (d207-6-239-189.bchsia.telus.net [207.6.239.189]) by priv-edmwaa06.telusplanet.net (BorderWare MXtreme Infinity Mail Firewall) with ESMTP id C66FW6CHK6; Tue, 5 Sep 2006 15:27:46 -0600 (MDT) Original-To: ams@gnu.org In-Reply-To: <20060904135111.7ADB544005@Psilocybe.Update.UU.SE> (Alfred M. Szmidt's message of "Mon\, 4 Sep 2006 15\:51\:11 +0200 \(CEST\)") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (berkeley-unix) 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:59395 Archived-At: "Alfred M. Szmidt" writes: > Hey, > > rcirc tries to use member* without (require 'cl), which causes > breakage. The following patch fixes this: *** rcirc.el 05 Sep 2006 12:14:49 -0700 1.26 --- rcirc.el 05 Sep 2006 14:22:05 -0700 *************** *** 1544,1552 **** (with-current-buffer b (dolist (type rcirc-activity-types) (rcirc-add-face 0 (length s) ! (case type ! ('nick 'rcirc-track-nick) ! ('keyword 'rcirc-track-keyword)) s))) s)) buffers ",")) --- 1544,1552 ---- (with-current-buffer b (dolist (type rcirc-activity-types) (rcirc-add-face 0 (length s) ! (cond ! ((eq type 'nick) 'rcirc-track-nick) ! ((eq type 'keyword) 'rcirc-track-keyword)) s))) s)) buffers ",")) *************** *** 1936,1945 **** (defun rcirc-markup-attributes (process sender response channel-buffer) (while (re-search-forward "\\([\C-b\C-_\C-v]\\).*?\\(\\1\\|\C-o\\)" nil t) (rcirc-add-face (match-beginning 0) (match-end 0) ! (case (char-after (match-beginning 1)) ! (?\C-b 'bold) ! (?\C-v 'italic) ! (?\C-_ 'underline))) ;; keep the ^O since it could terminate other attributes (when (not (eq ?\C-o (char-before (match-end 2)))) (delete-region (match-beginning 2) (match-end 2))) --- 1936,1945 ---- (defun rcirc-markup-attributes (process sender response channel-buffer) (while (re-search-forward "\\([\C-b\C-_\C-v]\\).*?\\(\\1\\|\C-o\\)" nil t) (rcirc-add-face (match-beginning 0) (match-end 0) ! (let ((ch (char-after (match-beginning 1)))) ! (cond ((eq ch ?\C-b) 'bold) ! ((eq ch ?\C-v) 'italic) ! ((eq ch ?\C-_) 'underline)))) ;; keep the ^O since it could terminate other attributes (when (not (eq ?\C-o (char-before (match-end 2)))) (delete-region (match-beginning 2) (match-end 2)))