From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#20608: 25.0.50; vc-git-log-view-mode inserts "Show 2X entries" at bob when interrupted Date: Wed, 27 May 2015 12:26:48 -0400 Message-ID: References: <86d21weqsc.fsf@yandex.ru> <5563B319.707@yandex.ru> <5565D145.3040606@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1432744051 24804 80.91.229.3 (27 May 2015 16:27:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 May 2015 16:27:31 +0000 (UTC) Cc: 20608@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed May 27 18:27:15 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YxeAi-0005BJ-RT for geb-bug-gnu-emacs@m.gmane.org; Wed, 27 May 2015 18:27:12 +0200 Original-Received: from localhost ([::1]:54727 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxeAi-0004DG-9L for geb-bug-gnu-emacs@m.gmane.org; Wed, 27 May 2015 12:27:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxeAe-00049Q-NZ for bug-gnu-emacs@gnu.org; Wed, 27 May 2015 12:27:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxeAY-0003pC-O7 for bug-gnu-emacs@gnu.org; Wed, 27 May 2015 12:27:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:48587) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxeAY-0003p8-L8 for bug-gnu-emacs@gnu.org; Wed, 27 May 2015 12:27:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YxeAY-00048V-C0 for bug-gnu-emacs@gnu.org; Wed, 27 May 2015 12:27:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 27 May 2015 16:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20608 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 20608-submit@debbugs.gnu.org id=B20608.143274401615886 (code B ref 20608); Wed, 27 May 2015 16:27:02 +0000 Original-Received: (at 20608) by debbugs.gnu.org; 27 May 2015 16:26:56 +0000 Original-Received: from localhost ([127.0.0.1]:58562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YxeAS-000489-4k for submit@debbugs.gnu.org; Wed, 27 May 2015 12:26:56 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:24084) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YxeAP-00047s-SF for 20608@debbugs.gnu.org; Wed, 27 May 2015 12:26:54 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0CbDQA731xV/9N+3mhcgxCEAsYTgk0EAgKBPDwRAQEBAQEBAYEKQQWDXQEBAwFWIwULCw4mEhQYDSSINwjPIwEBAQEBAQQBAQEBHos6hQUHhC0Fi0STU4ZpjwQjgWZVgVkigngBAQE X-IPAS-Result: A0CbDQA731xV/9N+3mhcgxCEAsYTgk0EAgKBPDwRAQEBAQEBAYEKQQWDXQEBAwFWIwULCw4mEhQYDSSINwjPIwEBAQEBAQQBAQEBHos6hQUHhC0Fi0STU4ZpjwQjgWZVgVkigngBAQE X-IronPort-AV: E=Sophos;i="5.13,465,1427774400"; d="scan'208";a="122407376" Original-Received: from 104-222-126-211.cpe.teksavvy.com (HELO ceviche.home) ([104.222.126.211]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 27 May 2015 12:26:48 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 09CAD660ED; Wed, 27 May 2015 12:26:48 -0400 (EDT) In-Reply-To: <5565D145.3040606@yandex.ru> (Dmitry Gutov's message of "Wed, 27 May 2015 17:14:29 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:103230 Archived-At: > Any reservations about this patch? Assuming it works, LGTM, Stefan > diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el > index a2c1cba..ec55867 100644 > --- a/lisp/vc/vc-dispatcher.el > +++ b/lisp/vc/vc-dispatcher.el > @@ -171,6 +171,12 @@ Another is that undo information is not kept." > (let ((camefrom (current-buffer)) > (olddir default-directory)) > (set-buffer (get-buffer-create buf)) > + (let ((oldproc (get-buffer-process (current-buffer)))) > + ;; If we wanted to wait for oldproc to finish before doing > + ;; something, we'd have used vc-eval-after. > + ;; Use `delete-process' rather than `kill-process' because we don't > + ;; want any of its output to appear from now on. > + (when oldproc (delete-process oldproc))) > (kill-all-local-variables) > (set (make-local-variable 'vc-parent-buffer) camefrom) > (set (make-local-variable 'vc-parent-buffer-name) > @@ -302,12 +308,6 @@ case, and the process object in the asynchronous case." > (eq buffer (current-buffer))) > (vc-setup-buffer buffer)) > ;; If there's some previous async process still running, just > kill it. > - (let ((oldproc (get-buffer-process (current-buffer)))) > - ;; If we wanted to wait for oldproc to finish before doing > - ;; something, we'd have used vc-eval-after. > - ;; Use `delete-process' rather than `kill-process' because we don't > - ;; want any of its output to appear from now on. > - (when oldproc (delete-process oldproc))) > (let ((squeezed (remq nil flags)) > (inhibit-read-only t) > (status 0))