From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#37395: [PATCH v3] diff-mode.el: take into account patch separators Date: Mon, 07 Oct 2019 06:39:40 +0200 Message-ID: <874l0l9njn.fsf@gnus.org> References: <1568323985.28657.0@yandex.ru> <20190916202643.27946-1-Hi-Angel@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="201322"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 37395@debbugs.gnu.org To: Konstantin Kharlamov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Oct 07 06:40:13 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iHKoe-000qGK-Ia for geb-bug-gnu-emacs@m.gmane.org; Mon, 07 Oct 2019 06:40:12 +0200 Original-Received: from localhost ([::1]:40566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHKoc-0002sw-Ld for geb-bug-gnu-emacs@m.gmane.org; Mon, 07 Oct 2019 00:40:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54214) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHKoX-0002sq-8K for bug-gnu-emacs@gnu.org; Mon, 07 Oct 2019 00:40:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iHKoW-0006k0-6M for bug-gnu-emacs@gnu.org; Mon, 07 Oct 2019 00:40:05 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:38374) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iHKoW-0006js-3N for bug-gnu-emacs@gnu.org; Mon, 07 Oct 2019 00:40:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iHKoT-0000Rm-Ux for bug-gnu-emacs@gnu.org; Mon, 07 Oct 2019 00:40:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 07 Oct 2019 04:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37395 X-GNU-PR-Package: emacs Original-Received: via spool by 37395-submit@debbugs.gnu.org id=B37395.15704231871685 (code B ref 37395); Mon, 07 Oct 2019 04:40:01 +0000 Original-Received: (at 37395) by debbugs.gnu.org; 7 Oct 2019 04:39:47 +0000 Original-Received: from localhost ([127.0.0.1]:47195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iHKoE-0000R7-LD for submit@debbugs.gnu.org; Mon, 07 Oct 2019 00:39:46 -0400 Original-Received: from quimby.gnus.org ([80.91.231.51]:56244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iHKoC-0000Qz-C9 for 37395@debbugs.gnu.org; Mon, 07 Oct 2019 00:39:44 -0400 Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=marnie) by quimby.gnus.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iHKo8-0005pq-Tz; Mon, 07 Oct 2019 06:39:43 +0200 In-Reply-To: <20190916202643.27946-1-Hi-Angel@yandex.ru> (Konstantin Kharlamov's message of "Mon, 16 Sep 2019 23:26:43 +0300") 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: 209.51.188.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:168496 Archived-At: (Some minor comments.) Konstantin Kharlamov writes: > +(defsubst diff-prev-line-if-patch-separator () > + "Return previous line if it has patch separator produced by > +git-format-patch." I don't think this needs to be a defsubst -- a defun is fine here. And the first doc string line should be a complete sentence. > +(setq-local diff-buffer-type nil) This should probably be a defvar and then a setq-local in `diff-mode'. > + (save-excursion > + (if (re-search-forward "^diff --git" nil t) > + (setq diff-buffer-type 'git) > + (setq diff-buffer-type nil)))) Hm... are we really guaranteed that all git diffs have that string in it somewhere? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no