From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#33567: Syntactic fontification of diff hunks Date: Wed, 05 Dec 2018 00:58:49 +0200 Organization: LINKOV.NET Message-ID: <87r2ew6fda.fsf@mail.linkov.net> References: <878t18j4is.fsf@mail.linkov.net> <83a7lobemr.fsf@gnu.org> <87a7lnv6ex.fsf@mail.linkov.net> <67cd7856-d52c-0e00-cc9c-25b833874b15@yandex.ru> <871s6yp517.fsf@mail.linkov.net> <83bm61aiw9.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1543968793 27570 195.159.176.226 (5 Dec 2018 00:13:13 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 5 Dec 2018 00:13:13 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) Cc: 33567@debbugs.gnu.org, dgutov@yandex.ru To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Dec 05 01:13:09 2018 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 1gUKoO-00072X-CL for geb-bug-gnu-emacs@m.gmane.org; Wed, 05 Dec 2018 01:13:08 +0100 Original-Received: from localhost ([::1]:59452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUKqV-0005E6-1i for geb-bug-gnu-emacs@m.gmane.org; Tue, 04 Dec 2018 19:15:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUKqK-0005BL-LE for bug-gnu-emacs@gnu.org; Tue, 04 Dec 2018 19:15:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUKqE-0002HO-T8 for bug-gnu-emacs@gnu.org; Tue, 04 Dec 2018 19:15:08 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:56897) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gUKqE-0002G8-Fb for bug-gnu-emacs@gnu.org; Tue, 04 Dec 2018 19:15:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gUKqE-0001s3-B1 for bug-gnu-emacs@gnu.org; Tue, 04 Dec 2018 19:15:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 05 Dec 2018 00:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33567 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 33567-submit@debbugs.gnu.org id=B33567.15439688617088 (code B ref 33567); Wed, 05 Dec 2018 00:15:02 +0000 Original-Received: (at 33567) by debbugs.gnu.org; 5 Dec 2018 00:14:21 +0000 Original-Received: from localhost ([127.0.0.1]:32915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gUKpY-0001qG-TT for submit@debbugs.gnu.org; Tue, 04 Dec 2018 19:14:21 -0500 Original-Received: from goldenrod.birch.relay.mailchannels.net ([23.83.209.74]:49036) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gUKpX-0001q8-Ck for 33567@debbugs.gnu.org; Tue, 04 Dec 2018 19:14:19 -0500 X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 2DFE82821D9; Wed, 5 Dec 2018 00:14:18 +0000 (UTC) Original-Received: from pdx1-sub0-mail-a54.g.dreamhost.com (unknown [100.96.29.126]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id C8323283841; Wed, 5 Dec 2018 00:14:17 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from pdx1-sub0-mail-a54.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.16.2); Wed, 05 Dec 2018 00:14:18 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Zesty-Towering: 6489860e5bc43de8_1543968857995_4124681783 X-MC-Loop-Signature: 1543968857995:741849859 X-MC-Ingress-Time: 1543968857994 Original-Received: from pdx1-sub0-mail-a54.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a54.g.dreamhost.com (Postfix) with ESMTP id 571617FF2B; Tue, 4 Dec 2018 16:14:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=linkov.net; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=linkov.net; bh=7ZTRKUJ65xGb/I05U8k4bSlf3mw=; b= hKIivMpwr1JWjjMTq2LZLtswjYFWDL5+VfSv3EMRVi/16IujE3g61MyGAj2cNXf0 c0hsY24UDrxZ8jMKQqQG4E1at6MtU6q7Qsm/Mclx9l4ZipN27sn1wu7WDXa5QS2p t1xNgSrbL4uapVBl9QgXdjVe0P4joah4zZe0bwwgnls= Original-Received: from mail.jurta.org (m91-129-103-7.cust.tele2.ee [91.129.103.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by pdx1-sub0-mail-a54.g.dreamhost.com (Postfix) with ESMTPSA id 18C4E7FF22; Tue, 4 Dec 2018 16:14:14 -0800 (PST) X-DH-BACKEND: pdx1-sub0-mail-a54 In-Reply-To: <83bm61aiw9.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 04 Dec 2018 08:46:46 +0200") X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: -100 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtkedrudefgedgudelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuggftfghnshhusghstghrihgsvgdpffftgfetoffjqffuvfenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufhofhffjgfkfgggtgesmhdtreertdertdenucfhrhhomheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqeenucfkphepledurdduvdelrddutdefrdejnecurfgrrhgrmhepmhhouggvpehsmhhtphdphhgvlhhopehmrghilhdrjhhurhhtrgdrohhrghdpihhnvghtpeeluddruddvledruddtfedrjedprhgvthhurhhnqdhprghthheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqedpmhgrihhlfhhrohhmpehjuhhriheslhhinhhkohhvrdhnvghtpdhnrhgtphhtthhopegvlhhiiiesghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpedt 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:153087 Archived-At: --=-=-= Content-Type: text/plain >> -(defun vc-find-revision-no-save (file revision &optional backend) >> - "Read REVISION of FILE into a buffer and return the buffer. >> +(defun vc-find-revision-no-save (file revision &optional backend buffer) >> + "Read REVISION of FILE into a BUFFER and return the buffer. > > Since you use BUFFER, please drop the "a" part. > > Also, the doc string should tell what BUFFER defaults to if omitted or > nil. Updated. >> + (let ((filebuf (or buffer (get-file-buffer file) (current-buffer))) > ^^^^^^^^^ > I would use bufferp here. What if someone calls the function with > something that is not a buffer? Added buffer-live-p. > And, btw, are buffer names allowed? I see that most VC functions work with buffer objects only. So buffer names could be allowed only when really necessary. > Similarly with other places where you make the same test (why not make > it once and bind some local variable to the result, btw?). Done: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=vc-find-revision-no-save-buffer.2.patch diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index de43544864..dbbc3e2038 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1998,33 +1998,41 @@ vc-find-revision-save (set (make-local-variable 'vc-parent-buffer) filebuf)) result-buf))) -(defun vc-find-revision-no-save (file revision &optional backend) - "Read REVISION of FILE into a buffer and return the buffer. -Unlike `vc-find-revision-save', doesn't save the created buffer to file." - (let ((filebuf (or (get-file-buffer file) (current-buffer))) - (filename (vc-version-backup-file-name file revision 'manual))) - (unless (or (get-file-buffer filename) - (file-exists-p filename)) +(defun vc-find-revision-no-save (file revision &optional backend buffer) + "Read REVISION of FILE into BUFFER and return the buffer. +If BUFFER omitted or nil, this function creates a new buffer and sets +`buffer-file-name' to the name constructed from the file name and the +revision number. +Unlike `vc-find-revision-save', doesn't save the buffer to the file." + (let* ((buffer (when (buffer-live-p buffer) buffer)) + (filebuf (or buffer (get-file-buffer file) (current-buffer))) + (filename (unless buffer (vc-version-backup-file-name file revision 'manual)))) + (unless (and (not buffer) + (or (get-file-buffer filename) + (file-exists-p filename))) (with-current-buffer filebuf (let ((failed t)) (unwind-protect (let ((coding-system-for-read 'no-conversion) - (coding-system-for-write 'no-conversion)) - (with-current-buffer (create-file-buffer filename) - (setq buffer-file-name filename) + (coding-system-for-write 'no-conversion)) + (with-current-buffer (or buffer (create-file-buffer filename)) + (unless buffer (setq buffer-file-name filename)) (let ((outbuf (current-buffer))) (with-current-buffer filebuf (if backend (vc-call-backend backend 'find-revision file revision outbuf) (vc-call find-revision file revision outbuf)))) (goto-char (point-min)) - (normal-mode) + (if buffer (let ((buffer-file-name file)) (normal-mode)) (normal-mode)) (set-buffer-modified-p nil) (setq buffer-read-only t)) (setq failed nil)) - (when (and failed (get-file-buffer filename)) + (when (and failed (unless buffer (get-file-buffer filename))) + (with-current-buffer (get-file-buffer filename) + (set-buffer-modified-p nil)) (kill-buffer (get-file-buffer filename))))))) - (let ((result-buf (or (get-file-buffer filename) + (let ((result-buf (or buffer + (get-file-buffer filename) (find-file-noselect filename)))) (with-current-buffer result-buf (set (make-local-variable 'vc-parent-buffer) filebuf)) --=-=-=--