From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#23824: 25.0.95; Prevent compare one buffer with itself Date: Wed, 22 Jun 2016 19:12:13 +0900 (JST) Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII X-Trace: ger.gmane.org 1466590751 21832 80.91.229.3 (22 Jun 2016 10:19:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 22 Jun 2016 10:19:11 +0000 (UTC) To: 23824@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jun 22 12:19:01 2016 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 1bFfF7-0003gA-UW for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Jun 2016 12:18:46 +0200 Original-Received: from localhost ([::1]:56991 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFfF2-0002R3-5s for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Jun 2016 06:18:40 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFf9f-0006Gs-4Z for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 06:13:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFf9Z-000362-Vv for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 06:13:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:38020) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFf9Z-00035x-RU for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 06:13:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bFf9Z-0001YS-NL for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 06:13:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 22 Jun 2016 10:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 23824 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.14665903505935 (code B ref -1); Wed, 22 Jun 2016 10:13:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 22 Jun 2016 10:12:30 +0000 Original-Received: from localhost ([127.0.0.1]:50357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFf94-0001Xf-Kh for submit@debbugs.gnu.org; Wed, 22 Jun 2016 06:12:30 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:54971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFf93-0001XT-JM for submit@debbugs.gnu.org; Wed, 22 Jun 2016 06:12:29 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFf8x-0002xF-GT for submit@debbugs.gnu.org; Wed, 22 Jun 2016 06:12:24 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:42043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFf8x-0002wr-Cm for submit@debbugs.gnu.org; Wed, 22 Jun 2016 06:12:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFf8v-0005fA-77 for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 06:12:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFf8r-0002uz-2B for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 06:12:21 -0400 Original-Received: from mail-pa0-x22d.google.com ([2607:f8b0:400e:c03::22d]:35200) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFf8q-0002us-RF for bug-gnu-emacs@gnu.org; Wed, 22 Jun 2016 06:12:16 -0400 Original-Received: by mail-pa0-x22d.google.com with SMTP id hl6so15692486pac.2 for ; Wed, 22 Jun 2016 03:12:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:date:to:subject:message-id:user-agent:mime-version; bh=FnW/RFv3b0Qj/vlLYXRw4aI62z5N5HG1INmVhYFuKyo=; b=w2YcBER7yAEG/VNcHNOFR/1p3GGwOUV1NCZa4f+FjPAbRrp5TnpkJvLTFAHq5bu/lj l6timxX1s4DLPSxw1rbwlnNFEH8A6sBCOM81NsWbna34K3BtPoiCN62+7stjGVKsnbdH VniWQI0yfOaiYGexU6Y5vflcScss9hVFcYehexWaKIVST/AkZuljlSu4teSOAJCh6zaT fhEFfn5fsLLRMjfST4Co8iHAw/Go8WOYo+9c2EQ4PN3rmRGDBRhG8xJ3qW64Wmi8TLKN j+kY/cl8De1fgZifFvgW0l4JXlv8bbOJRO7HRQkKEtcThtDbYScpqNtJEm7FKOwuDDfO g7nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:date:to:subject:message-id:user-agent :mime-version; bh=FnW/RFv3b0Qj/vlLYXRw4aI62z5N5HG1INmVhYFuKyo=; b=V6SLNNPwmJdPQA2c8wJLMv2Ve1mGVUD8oloBcQbysG0kDoKmXlADKJ70fMNxhRxS66 SrMo3C0caMO4ssN3UuaUSBLscmbe/88wfEbjgFwvYr2d64yh7lgJODSJNcaHUGgCk5wA z+T2jTV5WqePMcHM+P16U4LB9GDXG38K4mwZNdQoASnNiBLZzlSUarPmSUEXrg+kxrlq pje1U8wIIf2eWymahV9CE9P6ZXfeXxnHNnf6Abmw7iqUp18B+eyIGRUZlXSHAgBZBmQz 5qZgXxHb0TYVt7g6eVhQte6KabkiOydKzZFUJ+4M+zZ8EX5BStcMLTnhL0r+gatNnD8t nKrg== X-Gm-Message-State: ALyK8tKx+6Mctxx3gDeJHxNKaYPPk+unCjaFvE8P5kmIQMm2aAxlvgJ1sij7BC6MzxgSHA== X-Received: by 10.66.132.72 with SMTP id os8mr33745219pab.63.1466590335701; Wed, 22 Jun 2016 03:12:15 -0700 (PDT) Original-Received: from calancha-pc (softbank126103144234.bbtec.net. [126.103.144.234]) by smtp.gmail.com with ESMTPSA id v62sm72575276pfv.50.2016.06.22.03.12.14 for (version=TLSv1/SSLv3 cipher=OTHER); Wed, 22 Jun 2016 03:12:15 -0700 (PDT) X-Google-Original-From: Tino Calancha X-X-Sender: calancha@calancha-pc User-Agent: Alpine 2.20 (DEB 67 2015-01-07) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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:119924 Archived-At: When the current buffer, buf-a, is visiting FILE-B, buf-b should be a temporary buffer on sync with FILE-B. ./emacs -r -Q -eval '(progn (with-temp-file "/tmp/foo" (insert "foo")) (find-file "/tmp/foo") (insert "bar"))' M-: (highlight-compare-with-file "/tmp/foo") RET n n ; Answer no to saving suggestions. ;; Current buffer content different than /tmp/foo but no face highlight-changes shown. In GNU Emacs 25.0.95.2 (x86_64-pc-linux-gnu, GTK+ Version 3.20.6) Repository revision: 829733104db073f8abd67765eae162e7360281fa ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; >From 47921b1f4898f9fad3acdaa15c2c70fa4b3f9061 Mon Sep 17 00:00:00 2001 From: Tino Calancha Date: Wed, 22 Jun 2016 18:30:14 +0900 Subject: [PATCH] Prevent compare one buffer with itself * lisp/hilit-chg.el (highlight-compare-with-file): Use a new temporary buffer on sync with file-b; mark this buffer as unmodified to prevent being prompt to save it (Bug#23824). --- lisp/hilit-chg.el | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 8f042b6..89ca154 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -900,10 +900,18 @@ highlight-compare-with-file (let* ((buf-a (current-buffer)) (file-a (buffer-file-name)) (existing-buf (get-file-buffer file-b)) - (buf-b (or existing-buf - (find-file-noselect file-b)))) + (buf-b (cond ((eq buf-a existing-buf) + (let ((buf-new (generate-new-buffer (generate-new-buffer-name + (buffer-name buf-a))))) + (with-current-buffer buf-new + (insert-file-contents-literally file-b) + (set-buffer-modified-p nil)) buf-new)) + (t + (or existing-buf + (find-file-noselect file-b)))))) (highlight-markup-buffers buf-a file-a buf-b file-b (not existing-buf)) - (unless existing-buf + (when (or (not existing-buf) + (eq buf-a existing-buf)) (kill-buffer buf-b)) )) -- 2.8.1