From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#13689: [Aidan Gauland] Re: ERC match ACTION patch Date: Mon, 11 Feb 2013 17:26:29 -0500 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1360621671 10914 80.91.229.3 (11 Feb 2013 22:27:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 11 Feb 2013 22:27:51 +0000 (UTC) To: 13689@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Feb 11 23:28:13 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1U51rA-0000mw-0L for geb-bug-gnu-emacs@m.gmane.org; Mon, 11 Feb 2013 23:28:12 +0100 Original-Received: from localhost ([::1]:32995 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U51qq-0001GL-NG for geb-bug-gnu-emacs@m.gmane.org; Mon, 11 Feb 2013 17:27:52 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:34151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U51qj-0001Fs-UH for bug-gnu-emacs@gnu.org; Mon, 11 Feb 2013 17:27:50 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U51qf-0000OO-3B for bug-gnu-emacs@gnu.org; Mon, 11 Feb 2013 17:27:45 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:45729) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U51qe-0000OC-Vd for bug-gnu-emacs@gnu.org; Mon, 11 Feb 2013 17:27:40 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1U51r0-000687-Sq for bug-gnu-emacs@gnu.org; Mon, 11 Feb 2013 17:28:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 11 Feb 2013 22:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 13689 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.136062163323501 (code B ref -1); Mon, 11 Feb 2013 22:28:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 11 Feb 2013 22:27:13 +0000 Original-Received: from localhost ([127.0.0.1]:51193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1U51qC-00066z-OR for submit@debbugs.gnu.org; Mon, 11 Feb 2013 17:27:13 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:50612) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1U51qA-00066r-3u for submit@debbugs.gnu.org; Mon, 11 Feb 2013 17:27:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U51pm-0000Ak-8E for submit@debbugs.gnu.org; Mon, 11 Feb 2013 17:26:47 -0500 Original-Received: from lists.gnu.org ([208.118.235.17]:42565) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U51pm-0000Af-3n for submit@debbugs.gnu.org; Mon, 11 Feb 2013 17:26:46 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:33717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U51pk-0001CY-Cj for bug-gnu-emacs@gnu.org; Mon, 11 Feb 2013 17:26:46 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U51pf-00009N-Ko for bug-gnu-emacs@gnu.org; Mon, 11 Feb 2013 17:26:44 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:53855) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U51pf-00009A-G2 for bug-gnu-emacs@gnu.org; Mon, 11 Feb 2013 17:26:39 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AswGABK/CFFFpZnt/2dsb2JhbABEhkewW4dsF3OCSDNyDgIWGA03iBGgC45Ukk6NYYIWgRMDiGGGKJVxgV6DFQ X-IPAS-Result: AswGABK/CFFFpZnt/2dsb2JhbABEhkewW4dsF3OCSDNyDgIWGA03iBGgC45Ukk6NYYIWgRMDiGGGKJVxgV6DFQ X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="1022080" Original-Received: from 69-165-153-237.dsl.teksavvy.com (HELO pastel.home) ([69.165.153.237]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 11 Feb 2013 17:26:38 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 6E16F59255; Mon, 11 Feb 2013 17:26:33 -0500 (EST) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.43 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: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:71072 Archived-At: --=-=-= Content-Type: text/plain Forwarding so as to get a bug-number. Stefan --=-=-= Content-Type: message/rfc822 Content-Disposition: inline Return-Path: X-Original-To: monnier@iro.umontreal.ca Delivered-To: monnier@iro.umontreal.ca Received: from perlin.iro.umontreal.ca (perlin.iro.umontreal.ca [132.204.24.51]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id 3ADFF845A0 for ; Mon, 11 Feb 2013 14:10:37 -0500 (EST) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by perlin.iro.umontreal.ca (Postfix) with ESMTP id 028CFA10003 for ; Mon, 11 Feb 2013 14:10:03 -0500 (EST) Received: from localhost ([::1]:59590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4ylJ-0005iz-J4 for monnier@iro.umontreal.ca; Mon, 11 Feb 2013 14:09:57 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4ylC-0005iT-03 for emacs-devel@gnu.org; Mon, 11 Feb 2013 14:09:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U4ylA-0001bt-4q for emacs-devel@gnu.org; Mon, 11 Feb 2013 14:09:49 -0500 Received: from plane.gmane.org ([80.91.229.3]:41252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4yl9-0001ao-U5 for emacs-devel@gnu.org; Mon, 11 Feb 2013 14:09:48 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1U4ylQ-0002BU-IN for emacs-devel@gnu.org; Mon, 11 Feb 2013 20:10:04 +0100 Received: from 114-134-8-58.rurallink.co.nz ([114.134.8.58]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 11 Feb 2013 20:10:04 +0100 Received: from aidalgol by 114-134-8-58.rurallink.co.nz with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 11 Feb 2013 20:10:04 +0100 X-Injected-Via-Gmane: http://gmane.org/ To: emacs-devel@gnu.org From: Aidan Gauland Subject: Re: ERC match ACTION patch Date: Tue, 12 Feb 2013 08:07:17 +1300 Lines: 41 Message-ID: <87a9rafz4q.fsf@dimension8.tehua.net> References: <87ehgmfz7m.fsf@dimension8.tehua.net> X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 114-134-8-58.rurallink.co.nz User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) Cancel-Lock: sha1:VdpeJoacQq4n9z1gJHUWj4miU0M= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+monnier=iro.umontreal.ca@gnu.org Sender: emacs-devel-bounces+monnier=iro.umontreal.ca@gnu.org 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=-1.94, requis 5, BAYES_00 -2.60, MC_TSTLAST 0.00, RECEIVED_FROM_NOUNK 0.66, SPF_HELO_PASS -0.00) X-DIRO-MailScanner-From: emacs-devel-bounces+monnier=iro.umontreal.ca@gnu.org X-Spam-Status: No MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="====-=-=" --====-=-= Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Aidan Gauland writes: > `erc-match-message' truncates the beginning of ACTION messages. This > should fix it, but I'm not certain that I have not missed any obscure > edge cases. > > =E2=80=93Aidan Aaaaand here's the patch I forgot. --====-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=erc-match-ACTION-fix.patch Content-Description: erc-match ACTION patch === modified file 'lisp/erc/erc-match.el' --- lisp/erc/erc-match.el 2013-01-02 16:13:04 +0000 +++ lisp/erc/erc-match.el 2013-02-11 18:36:54 +0000 @@ -454,7 +454,15 @@ (match-end 0))) (message (buffer-substring (if (and nick-end (<= (+ 2 nick-end) (point-max))) - (+ 2 nick-end) + (+ nick-end + ;; Message starts 2 characters after + ;; the nick except for CTCP ACTION + ;; messages. + (if (string= "* " + (buffer-substring (- nick-beg 2) + nick-beg)) + 1 + 2)) (point-min)) (point-max)))) (when (and vector --====-=-=-- --=-=-=--