From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#37395: [PATCH] diff-mode.el: take into account patch separators Date: Fri, 13 Sep 2019 09:14:03 +0300 Message-ID: <838sqs205w.fsf@gnu.org> References: <1568323985.28657.0@yandex.ru> <20190912213445.16304-1-Hi-Angel@yandex.ru> Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="265066"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 37395@debbugs.gnu.org To: Konstantin Kharlamov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Sep 13 08:14:12 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 1i8eqR-0016pO-Fw for geb-bug-gnu-emacs@m.gmane.org; Fri, 13 Sep 2019 08:14:12 +0200 Original-Received: from localhost ([::1]:40556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8eqQ-00061y-6P for geb-bug-gnu-emacs@m.gmane.org; Fri, 13 Sep 2019 02:14:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52455) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8eqJ-00061r-Jh for bug-gnu-emacs@gnu.org; Fri, 13 Sep 2019 02:14:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8eqI-00030K-Lm for bug-gnu-emacs@gnu.org; Fri, 13 Sep 2019 02:14:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:35447) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i8eqI-0002zo-J1 for bug-gnu-emacs@gnu.org; Fri, 13 Sep 2019 02:14:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i8eqI-0007yW-82 for bug-gnu-emacs@gnu.org; Fri, 13 Sep 2019 02:14:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 13 Sep 2019 06:14:02 +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.156835523930639 (code B ref 37395); Fri, 13 Sep 2019 06:14:02 +0000 Original-Received: (at 37395) by debbugs.gnu.org; 13 Sep 2019 06:13:59 +0000 Original-Received: from localhost ([127.0.0.1]:44268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i8eqE-0007y6-OS for submit@debbugs.gnu.org; Fri, 13 Sep 2019 02:13:58 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:43948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i8eqC-0007xs-KC for 37395@debbugs.gnu.org; Fri, 13 Sep 2019 02:13:57 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:48282) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1i8eq7-0002u4-6L; Fri, 13 Sep 2019 02:13:51 -0400 Original-Received: from [176.228.60.248] (port=1647 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1i8eq6-00056K-FZ; Fri, 13 Sep 2019 02:13:50 -0400 In-reply-to: <20190912213445.16304-1-Hi-Angel@yandex.ru> (message from Konstantin Kharlamov on Fri, 13 Sep 2019 00:34:45 +0300) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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:166381 Archived-At: > From: Konstantin Kharlamov > Date: Fri, 13 Sep 2019 00:34:45 +0300 > > * lisp/vc/diff-mode.el (diff-goto-line-before-patch-separator): an > inline function to check if prev. line was git-format-patch separator, > in which case go there. > (diff-end-of-hunk): make use of (diff-goto-line-before-patch-separator) The descriptions of changes should start with a capital letter. Also, your lines in the commit log message are too long, they should not exceed 61 characters (because in the release tarball we create a ChangeLog file from them, which prepends a TAB character to each line). > +(defsubst diff-goto-line-before-patch-separator () > + "Go to prev. line, then if it has patch separator as produced > +by git-format-patch, stay there. Otherwise go back." The first line of a doc string should be a complete sentence. I suggest to rephrase as follows: Return buffer position before patch separator produced by git-format-patch. > + (previous-line) > + (when (not (looking-at "-- ")) > + (next-line)) > + (point)) Btw, Diff mode is more general than just Git-produced diffs. Is there any possibility that this change will misfire in diffs produced by other tools? If so, perhaps we should also verify the buffer is under Git control. Thanks.