From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: rcirc bug Date: Tue, 05 Sep 2006 17:46:06 -0400 Message-ID: References: <20060904135111.7ADB544005@Psilocybe.Update.UU.SE> <87mz9eknqm.fsf@cut.bc.hsia.telus.net> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1157492798 6125 80.91.229.2 (5 Sep 2006 21:46:38 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 5 Sep 2006 21:46:38 +0000 (UTC) Cc: ams@gnu.org, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Sep 05 23:46:37 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 1GKikX-0006Vj-67 for ged-emacs-devel@m.gmane.org; Tue, 05 Sep 2006 23:46:29 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GKikW-0005mz-RH for ged-emacs-devel@m.gmane.org; Tue, 05 Sep 2006 17:46:28 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1GKikK-0005m2-6k for emacs-devel@gnu.org; Tue, 05 Sep 2006 17:46:16 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1GKikI-0005l9-Sn for emacs-devel@gnu.org; Tue, 05 Sep 2006 17:46:15 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GKikI-0005kv-Mu for emacs-devel@gnu.org; Tue, 05 Sep 2006 17:46:14 -0400 Original-Received: from [132.204.24.67] (helo=mercure.iro.umontreal.ca) by monty-python.gnu.org with esmtp (Exim 4.52) id 1GKikI-0007YT-3j; Tue, 05 Sep 2006 17:46:14 -0400 Original-Received: from hidalgo.iro.umontreal.ca (hidalgo.iro.umontreal.ca [132.204.27.50]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id 2C0E92CEBD3; Tue, 5 Sep 2006 17:46:13 -0400 (EDT) Original-Received: from faina.iro.umontreal.ca (faina.iro.umontreal.ca [132.204.26.177]) by hidalgo.iro.umontreal.ca (Postfix) with ESMTP id 389C03FE1; Tue, 5 Sep 2006 17:46:06 -0400 (EDT) Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 209AA6C7F5; Tue, 5 Sep 2006 17:46:06 -0400 (EDT) Original-To: Ryan Yeske In-Reply-To: <87mz9eknqm.fsf@cut.bc.hsia.telus.net> (Ryan Yeske's message of "Tue, 05 Sep 2006 14:27:45 -0700") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) X-DIRO-MailScanner-Information: Please contact the ISP for more information X-DIRO-MailScanner: Found to be clean X-DIRO-MailScanner-SpamCheck: n'est pas un polluriel, SpamAssassin (score=-2.82, requis 5, autolearn=not spam, ALL_TRUSTED -2.82) X-DIRO-MailScanner-From: monnier@iro.umontreal.ca 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:59400 Archived-At: > "Alfred M. Szmidt" writes: >> Hey, >> >> rcirc tries to use member* without (require 'cl), which causes >> breakage. > The following patch fixes this: Odd. `case' is perfectly OK since it only needs (eval-when-compile (require 'cl)), which rcirc.el already has. Stefan > *** 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))) > _______________________________________________ > Emacs-devel mailing list > Emacs-devel@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-devel