From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Dima Kogan Newsgroups: gmane.emacs.bugs Subject: bug#25524: 26.0.50; diff-mode is broken Date: Wed, 25 Jan 2017 13:25:04 -0800 Message-ID: <87wpdin87j.fsf@secretsauce.net> References: <874m0nwshr.fsf@secretsauce.net> <87tw8ncd6v.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1485379598 18463 195.159.176.226 (25 Jan 2017 21:26:38 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 25 Jan 2017 21:26:38 +0000 (UTC) User-Agent: mu4e 0.9.17; emacs 26.0.50.1 Cc: 25524@debbugs.gnu.org, Tino Calancha To: Noam Postavsky Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jan 25 22:26:34 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cWV57-0002vX-Dx for geb-bug-gnu-emacs@m.gmane.org; Wed, 25 Jan 2017 22:26:17 +0100 Original-Received: from localhost ([::1]:34615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cWV59-00064y-Io for geb-bug-gnu-emacs@m.gmane.org; Wed, 25 Jan 2017 16:26:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cWV4v-00061M-DT for bug-gnu-emacs@gnu.org; Wed, 25 Jan 2017 16:26:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cWV4s-0002el-A8 for bug-gnu-emacs@gnu.org; Wed, 25 Jan 2017 16:26:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:45516) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cWV4s-0002eg-4H for bug-gnu-emacs@gnu.org; Wed, 25 Jan 2017 16:26:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cWV4r-0002mH-U6 for bug-gnu-emacs@gnu.org; Wed, 25 Jan 2017 16:26:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dima Kogan Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 25 Jan 2017 21:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25524 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 25524-submit@debbugs.gnu.org id=B25524.148537950710616 (code B ref 25524); Wed, 25 Jan 2017 21:26:01 +0000 Original-Received: (at 25524) by debbugs.gnu.org; 25 Jan 2017 21:25:07 +0000 Original-Received: from localhost ([127.0.0.1]:43715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cWV3z-0002lA-7x for submit@debbugs.gnu.org; Wed, 25 Jan 2017 16:25:07 -0500 Original-Received: from out1-smtp.messagingengine.com ([66.111.4.25]:35656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cWV3x-0002l2-7g for 25524@debbugs.gnu.org; Wed, 25 Jan 2017 16:25:05 -0500 Original-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id C237A20B7E; Wed, 25 Jan 2017 16:25:04 -0500 (EST) Original-Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Wed, 25 Jan 2017 16:25:04 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=secretsauce.net; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=ASLzdr0w75p3p01eDA4CK3O7090=; b=rz/mYX htmZocP53PSAAEJ1Ew1PTAXYKLQGRH0TgSZ0eie/u+uzTFUtTp/+FME0urjJ3CWj 7oTYs8GFLkGoU+Iw1hWKP+b+CjeVbrjV927hvNi/X930EBKGE43QjrL6YuQVuI1H bxshqApTd+YuTTatxAZKXjcaMsuUL40pbOJvQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=ASLzdr0w75p3p0 1eDA4CK3O7090=; b=HU6+znKu/RdpoVjsxx4lKrHmDG58KC/Ag3vEAaYvQz0foM DJ9AdXrn4QAcoQi68KysyW4Ka8DbZDW+0tYxlFO7kWHsam5MZY3xb2yod5GO/Clk 8zt2NTj1WvnU/u1j8oUTkFw7jrFAPY1514k+QSSnmb0uGuWPNqDCmOBFr2/y4= X-ME-Sender: X-Sasl-enc: szIg+M4viD5baH2lJsVikP74+2sBNIUr+NXs8ZspW447 1485379504 Original-Received: from shorty.local (unknown [128.149.110.210]) by mail.messagingengine.com (Postfix) with ESMTPA id 84E217E5A0; Wed, 25 Jan 2017 16:25:04 -0500 (EST) Original-Received: from dima by shorty.local with local (Exim 4.88) (envelope-from ) id 1cWV3w-000755-4L; Wed, 25 Jan 2017 13:25:04 -0800 In-reply-to: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:128498 Archived-At: Noam Postavsky writes: > On Wed, Jan 25, 2017 at 11:32 AM, Tino Calancha wrote: >> ;; "index ", "old mode", "new mode", "new file mode" and >> -;; "deleted file mode" are output by git-diff. >> +;; "deleted file mode" are output by git-diff; "Index: " and >> +;; "========..." by SVN. >> (defconst diff-file-junk-re >> - "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file") >> + (concat "Index: \\|" (make-string 67 ?=) "\\|" >> + "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file")) > > Is it safe to assume exactly 67 "="? Maybe it would be better to use > something like "=\\{20,\\}", i.e. a sequence of 20 or more "=". More broadly, are we sure we need to be touching this? The previous approach and the one before that worked with the stock regexes.