From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#25524: 26.0.50; diff-mode is broken Date: Sun, 29 Jan 2017 18:53:22 +0900 Message-ID: <87h94ijip9.fsf@calancha-pc> References: <874m0nwshr.fsf@secretsauce.net> <87tw8ncd6v.fsf@gmail.com> <87k29ie94o.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1485683660 22081 195.159.176.226 (29 Jan 2017 09:54:20 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 29 Jan 2017 09:54:20 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) To: 25524-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Jan 29 10:54:15 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 1cXmBV-000507-Q4 for geb-bug-gnu-emacs@m.gmane.org; Sun, 29 Jan 2017 10:54:09 +0100 Original-Received: from localhost ([::1]:54675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cXmBb-0006wl-BM for geb-bug-gnu-emacs@m.gmane.org; Sun, 29 Jan 2017 04:54:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cXmBS-0006rV-Sd for bug-gnu-emacs@gnu.org; Sun, 29 Jan 2017 04:54:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cXmBO-0006qN-78 for bug-gnu-emacs@gnu.org; Sun, 29 Jan 2017 04:54:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:51504) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cXmBO-0006qE-4A for bug-gnu-emacs@gnu.org; Sun, 29 Jan 2017 04:54:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cXmBN-0002BA-To for bug-gnu-emacs@gnu.org; Sun, 29 Jan 2017 04:54:01 -0500 Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Sun, 29 Jan 2017 09:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 25524 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 25524@debbugs.gnu.org, tino.calancha@gmail.com, dima@secretsauce.net Original-Received: via spool by 25524-done@debbugs.gnu.org id=D25524.14856836168339 (code D ref 25524); Sun, 29 Jan 2017 09:54:01 +0000 Original-Received: (at 25524-done) by debbugs.gnu.org; 29 Jan 2017 09:53:36 +0000 Original-Received: from localhost ([127.0.0.1]:49701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cXmAx-0002AQ-Qc for submit@debbugs.gnu.org; Sun, 29 Jan 2017 04:53:35 -0500 Original-Received: from mail-pg0-f67.google.com ([74.125.83.67]:34877) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cXmAv-0002AE-Tn for 25524-done@debbugs.gnu.org; Sun, 29 Jan 2017 04:53:34 -0500 Original-Received: by mail-pg0-f67.google.com with SMTP id 204so28946716pge.2 for <25524-done@debbugs.gnu.org>; Sun, 29 Jan 2017 01:53:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version; bh=dY3Vk2ktj2NQoTcYX6pjkldl4Mv37bALWgp6zWQVx/Q=; b=G2/J9VoUUy11R77AW2JyRB+XAjJhN7pHZ5d5iKf+DJH4cMogfiTmTdCmAGJh21JKIs g5wuqWLzWegO4ebw2Rm0I4gwRCDfZDSceZ0xb5Q99zJhc9ft1JD5dcxId8f7WLrJV4tH Rnj5ZYk7AKUDfyI4Br2KutMeanhL3SPWYA3p1vL1WtM1R1FDwvVUJEomnqlK1a+TuaXW 4eea2Ho/LqFTkubMU0i8+Mqg3esAj2VF9i/zUzj7QojLcnhTmgKuI2ruJhCxks288e7K frOVvcjJXxYCSKDJdVd32EdLdU8BiEdYmoLjNgz7P3IxsnR2B0YrlTx7Xk9ETFUD+ZuA xgiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=dY3Vk2ktj2NQoTcYX6pjkldl4Mv37bALWgp6zWQVx/Q=; b=GPEOSa/yS7VpxmLxYzbiyFsx1tWo3deFNgGozNuKrxsjKZScjgwYvgHAIvgefRtQ7T 2gZyaPypVL3pIWkFW8FUavDeIj5lW1kr0bF92ueOESnaz5aw85lytydgL2UamAIulRgs +UXdH2xNZvQ19V3EC2AvFVcpY0lj670FK3V/bAPVQuCcJ+W0AkCv0Y7GlW0rg/lelmyV nV6QPxCqKMT90h2/tSLJIuyaioY+CP26Y9/Y3MFsECQ6hzbXj8slRZpfXIOYIUGJImcv BUycYy2hvnzyKrwNq6n751jfzZ9C/iNAo0To/KSfQPQ78suUYkttsf2VFcxqGy4wgi3b qKoA== X-Gm-Message-State: AIkVDXIJpuRvYchdbosojZi4CDgI9UosBuk3Ykj+oMmZZDUN30fYza39V0dWeutMnNUleA== X-Received: by 10.84.147.71 with SMTP id r7mr24365352ple.48.1485683607855; Sun, 29 Jan 2017 01:53:27 -0800 (PST) Original-Received: from calancha-pc (33.94.100.220.dy.bbexcite.jp. [220.100.94.33]) by smtp.gmail.com with ESMTPSA id p25sm23808286pfd.0.2017.01.29.01.53.26 for <25524-done@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Jan 2017 01:53:27 -0800 (PST) In-Reply-To: <87k29ie94o.fsf@gmail.com> (Tino Calancha's message of "Thu, 26 Jan 2017 13:29:59 +0900") 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:128747 Archived-At: Tino Calancha writes: > 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 "=". > Humm probably 20 is OK, but i am not using SVN in a while: i ignore if > such '====...' might be coustomizable. > Updated the patch to use >=20 ?=. Pushed fix to master branch as commit 0073223c23749ffd6bd3f882bc30a82cc37efd2a