From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: Re: Handle empty regexp in `rmail-nonignored-headers' Date: Mon, 11 Feb 2008 01:01:14 +0000 Message-ID: <873as0qpb9.fsf@bzg.ath.cx> References: <87tzkgix8h.fsf@bzg.ath.cx> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1202691690 23546 80.91.229.12 (11 Feb 2008 01:01:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 11 Feb 2008 01:01:30 +0000 (UTC) Cc: emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 11 02:01:52 2008 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 1JON3Q-0004DM-Hn for ged-emacs-devel@m.gmane.org; Mon, 11 Feb 2008 02:01:52 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JON2x-0003Nn-Fn for ged-emacs-devel@m.gmane.org; Sun, 10 Feb 2008 20:01:23 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JON2t-0003NU-RO for emacs-devel@gnu.org; Sun, 10 Feb 2008 20:01:19 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JON2s-0003NA-2J for emacs-devel@gnu.org; Sun, 10 Feb 2008 20:01:19 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JON2r-0003N7-VW for emacs-devel@gnu.org; Sun, 10 Feb 2008 20:01:18 -0500 Original-Received: from ug-out-1314.google.com ([66.249.92.175]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JON2r-0005l7-J5 for emacs-devel@gnu.org; Sun, 10 Feb 2008 20:01:17 -0500 Original-Received: by ug-out-1314.google.com with SMTP id a2so214844ugf.48 for ; Sun, 10 Feb 2008 17:01:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:cc:subject:in-reply-to:references:user-agent:date:message-id:mime-version:content-type:sender; bh=OqyRoNzPSgUtehJ2aw6ujsy9tOEnXBSnF+2sG3xoTjc=; b=mwpv+kj0fesqoYCN9LMGe0hi8JXBv/o7kEAb8r/pWU2TPPm+uECKWLCoTV4ANQ6Yf2064cAqgQM/xX9NY23jFiV2NXuH2NUJLQGZhCNNlV1XJm9d8c79Kvg4JpMVt2vXNIh6IYzpjAU+8Yjxkhw5UzDwWFI6TY38T7LoNMW+mEU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:in-reply-to:references:user-agent:date:message-id:mime-version:content-type:sender; b=pBPRLwjvR84IT+KnhnYGORc/UtZ0SRKQlwEmAnAfDYevQZfo+u0G+tObmebZxWFevUJZtThDq2Rdq4MZb/xH4U3DMThI9UUu8CLWpy6MwycLnMNxWFUVdTI5I/yLReIUixGpPEEpbnRQNsy/zNnZ18LZurVIkCfXM/9M9CzWMzI= Original-Received: by 10.66.249.16 with SMTP id w16mr8435387ugh.32.1202691676676; Sun, 10 Feb 2008 17:01:16 -0800 (PST) Original-Received: from bzg.ath.cx ( [81.99.213.34]) by mx.google.com with ESMTPS id b39sm5816655ugf.27.2008.02.10.17.01.14 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 10 Feb 2008 17:01:15 -0800 (PST) Original-Received: by bzg.ath.cx (Postfix, from userid 1000) id 9E65A158253; Mon, 11 Feb 2008 01:01:14 +0000 (GMT) In-Reply-To: (Richard Stallman's message of "Sun, 10 Feb 2008 19:17:37 -0500") User-Agent: Gnus/5.110007 (No Gnus v0.7) Emacs/23.0.60 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) 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:88698 Archived-At: --=-=-= Richard Stallman writes: > This simple patch fixed this -- can I commit it? > > The patch looks correct. Following Stefan's advice, I applied this patch instead: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=rmail.el.patch diff -u /home/guerry/install/cvs/emacs/lisp/mail/rmail.el.\~1.447.\~ /home/guerry/install/cvs/emacs/lisp/mail/rmail.el --- /home/guerry/install/cvs/emacs/lisp/mail/rmail.el.~1.447.~ 2008-02-01 16:01:27.000000000 +0000 +++ /home/guerry/install/cvs/emacs/lisp/mail/rmail.el 2008-02-10 21:13:03.000000000 +0000 @@ -299,6 +299,7 @@ "*Regexp to match X header fields that Rmail should show. This regexp overrides `rmail-ignored-headers'; if both this regexp and that one match a certain header field, Rmail shows the field. +If this is nil, ignore all header fields in `rmail-ignored-headers'. This variable is used for reformatting the message header, which normally happens once for each message, @@ -306,7 +307,7 @@ To make a change in this variable take effect for a message that you have already viewed, go to that message and type \\[rmail-toggle-header] twice." - :type 'regexp + :type '(choice (const nil) (regexp)) :group 'rmail-headers) ;;;###autoload @@ -2329,7 +2330,8 @@ (while (and ignored-headers (re-search-forward ignored-headers nil t)) (beginning-of-line) - (if (looking-at rmail-nonignored-headers) + (if (and rmail-nonignored-headers + (looking-at rmail-nonignored-headers)) (forward-line 1) (delete-region (point) (save-excursion Diff finished. Mon Feb 11 01:00:01 2008 --=-=-= -- Bastien --=-=-=--