From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: diff-mode misinterprets empty lines. Date: Sat, 05 Jan 2008 19:15:06 -0500 Message-ID: <3n4pdrlshh.fsf@fencepost.gnu.org> References: <85ir3l767y.fsf@lola.goethe.zz> <87ir3d1tn7.fsf@penguin.cs.ucla.edu> <878x494f9w.fsf@rho.meyering.net> <857ijtwgpw.fsf@lola.goethe.zz> <87k5nt2xga.fsf@rho.meyering.net> <854pexur0g.fsf@lola.goethe.zz> <87hcix827c.fsf@penguin.cs.ucla.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1199578568 2199 80.91.229.12 (6 Jan 2008 00:16:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 6 Jan 2008 00:16:08 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 06 01:16:25 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 1JBJBa-0008SD-OD for ged-emacs-devel@m.gmane.org; Sun, 06 Jan 2008 01:16:23 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JBJBB-00047l-2Y for ged-emacs-devel@m.gmane.org; Sat, 05 Jan 2008 19:15:53 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JBJAU-0003Qu-JR for emacs-devel@gnu.org; Sat, 05 Jan 2008 19:15:10 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JBJAS-0003Pr-VL for emacs-devel@gnu.org; Sat, 05 Jan 2008 19:15:10 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JBJAS-0003Pl-Rp for emacs-devel@gnu.org; Sat, 05 Jan 2008 19:15:08 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JBJAS-0003SA-9N for emacs-devel@gnu.org; Sat, 05 Jan 2008 19:15:08 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.60) (envelope-from ) id 1JBJAQ-0000eh-Kv; Sat, 05 Jan 2008 19:15:06 -0500 X-Spook: FTS2000 AK-47 Fortezza analyzer Rule Psix Compsec X-Ran: ild1xTzQ45C8FDGO`13|\z'`mCBcB?Oz+VMJ%arF:rCD_OR@VzJ/jZ4@h*iq3YkCoGdiF0 X-Hue: black X-Attribution: GM In-Reply-To: (Stefan Monnier's message of "Thu, 06 Dec 2007 10:39:25 -0500") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-kernel: by monty-python.gnu.org: 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:86266 Archived-At: In an effort to clear FOR-RELEASE, here is a simple-minded attempt to deal with this. It seems to fix the original problem at least. *** diff-mode.el.~1.122.~ 2007-10-21 13:00:12.000000000 -0700 --- diff-mode.el 2008-01-05 15:58:41.000000000 -0800 *************** *** 403,409 **** (setq style (diff-hunk-style style)) (let ((end (and (re-search-forward (case style ;; A `unified' header is ambiguous. ! (unified (concat "^[^-+# \\]\\|" diff-file-header-re)) (context "^[^-+#! \\]") (normal "^[^<>#\\]") --- 403,409 ---- (setq style (diff-hunk-style style)) (let ((end (and (re-search-forward (case style ;; A `unified' header is ambiguous. ! (unified (concat "^[^-+# \\\n]\\|" diff-file-header-re)) (context "^[^-+#! \\]") (normal "^[^<>#\\]")