From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up Date: Thu, 15 Jun 2023 10:20:18 +0300 Message-ID: <83ttv9tcnh.fsf@gnu.org> References: Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17751"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 64071@debbugs.gnu.org To: Spencer Baugh , Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jun 15 09:21:29 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q9hIO-0004PO-GA for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 15 Jun 2023 09:21:28 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q9hI6-0004K3-At; Thu, 15 Jun 2023 03:21:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9hHy-0004JU-UQ for bug-gnu-emacs@gnu.org; Thu, 15 Jun 2023 03:21:05 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q9hHy-0008K7-LN for bug-gnu-emacs@gnu.org; Thu, 15 Jun 2023 03:21:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q9hHy-0000ZJ-6o for bug-gnu-emacs@gnu.org; Thu, 15 Jun 2023 03:21: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: Thu, 15 Jun 2023 07:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64071 X-GNU-PR-Package: emacs Original-Received: via spool by 64071-submit@debbugs.gnu.org id=B64071.16868136062087 (code B ref 64071); Thu, 15 Jun 2023 07:21:02 +0000 Original-Received: (at 64071) by debbugs.gnu.org; 15 Jun 2023 07:20:06 +0000 Original-Received: from localhost ([127.0.0.1]:46038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9hH4-0000Xa-8p for submit@debbugs.gnu.org; Thu, 15 Jun 2023 03:20:06 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:42596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9hH0-0000Ww-7U for 64071@debbugs.gnu.org; Thu, 15 Jun 2023 03:20:04 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9hGu-00081E-Iw; Thu, 15 Jun 2023 03:19:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=yzgraOGqO1nfEIwNDbY085w0HJEWzs2ydB0Qpt5agro=; b=kq53LKUjHObK Owwwzf97ACUf10okapVYUedfPMVDAUXpGM+sgPmVRo9E1vPjzLvtxBf+jcaG9Sk5wW/vWGsX4JSqd S8isOHHRcv7TWstWOobdRfKHTSPIFEeJ9niJclxx15r5OnRV5raw4JzAI1huVTnCe7B+ZK+VfNgr7 F9Byr7xEyNSF+bkOYpZpYbXSfvh2mcWSdTgGcU351qc/OlTR6swnQ6DmT1/vdx8GRTmRTkAi4o+ie XRCzLezITcSUDXjwA5my4paj7uB12pFD+n0L5UGN1EBRK6eYKCbYCl+vXh4KHZpWq11b4xIPKLJid XEU/f8nRuvEIyaCn1XfIGA==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9hGu-00020q-3a; Thu, 15 Jun 2023 03:19:56 -0400 In-Reply-To: (message from Spencer Baugh on Wed, 14 Jun 2023 17:41:39 -0400) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:263403 Archived-At: > From: Spencer Baugh > Date: Wed, 14 Jun 2023 17:41:39 -0400 > > 1. emacs -Q > 2. Create a buffer containing: > <<<<<<< left > foo > ======= > bar > >>>>>>> right > 3. M-x smerge-mode > 4. M-x smerge-diff-upper-lower > 5. The resulting *vc-diff* buffer is in diff-mode but it's not > read-only, which is unusual for a *vc-diff* buffer. That command enters diff-mode, and diff-mode doesn't force read-only status on the current buffer. Why should Smerge force that? > Probably there is also other setup missing. Which ones, and to what mode they belong? > Relatedly, if a *vc-diff* buffer already exists, smerge-mode will use it > without updating the mode-line, so it will say, for example, "Diff from > *vc-change-log*" despite the diff being from smerge conflict resolution. This should probably be easy to fix, and the fix should be safe enough for the emacs-29 branch. How about proposing such a fix, and leaving the more controversial aspects of this alone for now? Thanks.