From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: sbaugh@catern.com Newsgroups: gmane.emacs.bugs Subject: bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up Date: Sat, 19 Aug 2023 12:32:01 +0000 (UTC) Message-ID: <87pm3jgqm6.fsf@catern.com> References: <83ttv9tcnh.fsf@gnu.org> <83pm5fvmoi.fsf@gnu.org> <83a5wjvj48.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40149"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Spencer Baugh , monnier@iro.umontreal.ca, 64071@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Aug 19 14:33:18 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 1qXL8n-000A9M-JQ for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 19 Aug 2023 14:33:18 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qXL8Z-0003SG-MM; Sat, 19 Aug 2023 08:33:05 -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 1qXL8X-0003S6-4h for bug-gnu-emacs@gnu.org; Sat, 19 Aug 2023 08:33:01 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qXL8W-0003hT-Qc for bug-gnu-emacs@gnu.org; Sat, 19 Aug 2023 08:33:00 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qXL8X-0005cv-Oy for bug-gnu-emacs@gnu.org; Sat, 19 Aug 2023 08:33:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: sbaugh@catern.com Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 19 Aug 2023 12:33:01 +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.169244833121568 (code B ref 64071); Sat, 19 Aug 2023 12:33:01 +0000 Original-Received: (at 64071) by debbugs.gnu.org; 19 Aug 2023 12:32:11 +0000 Original-Received: from localhost ([127.0.0.1]:49667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXL7j-0005bo-9e for submit@debbugs.gnu.org; Sat, 19 Aug 2023 08:32:11 -0400 Original-Received: from s.wrqvtbkv.outbound-mail.sendgrid.net ([149.72.123.24]:16182) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXL7h-0005bY-2G for 64071@debbugs.gnu.org; Sat, 19 Aug 2023 08:32:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=catern.com; h=from:subject:in-reply-to:references:mime-version:to:cc:content-type: content-transfer-encoding:cc:content-type:from:subject:to; s=s1; bh=yqfY2jDBGDRwjS7/yMHqzfD4WuiZa7SfODWRcYWIxOs=; b=F90OH1DCzcwZ5OYSg0M7hvsGHXGtO+/awvbwdw9IDoe4leicuwxRZwP0ggdSTMCo1HzE l93UQ+rnwpiW2mDD0ZysJrBrmt10TSYX7974uNwdH6i1Hy1lbrlKRMq2fcvGcBaGCcKaOM /r7WYjwd+rNm8dU/7g/X8kP8Mps/P2O6cwsayBMu/6Eh0WjKXBQup7BrxsgGnpnk7AAtHx 2UmVVtRIkNlgMPx7Z3swzB5PYY7tdYOx4kXSXHiiaPoI/9i0tLiOatECUDvQPK9+j98m7P iOeNvBo5auWhZWkAUkik0GsBWjqHegsOt839PHv5K/bjC44MraZOdwIAEViDrK8g== Original-Received: by filterdrecv-8684c58db7-nkctk with SMTP id filterdrecv-8684c58db7-nkctk-1-64E0B641-36 2023-08-19 12:32:01.717929911 +0000 UTC m=+8686413.891162219 Original-Received: from earth.catern.com (unknown) by geopod-ismtpd-20 (SG) with ESMTP id T5LXfW5dT-SwUbU8OJHcAg Sat, 19 Aug 2023 12:32:01.449 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=::1; helo=localhost; envelope-from=sbaugh@catern.com; receiver=gnu.org Original-Received: from localhost (localhost [IPv6:::1]) by earth.catern.com (Postfix) with ESMTPSA id 1510B6015C; Sat, 19 Aug 2023 08:32:01 -0400 (EDT) In-Reply-To: <83a5wjvj48.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 28 Jun 2023 15:58:31 +0300") X-SG-EID: ZgbRq7gjGrt0q/Pjvxk7wM0yQFRdOkTJAtEbkjCkHbIwHD2ndIRL6u5vuupkDxzXDElFyeRJhZz8+26394g00uz0S1vjPvoTqo9jLrqalUAophMx3py0nxtqhN3X7VCrP1wKUBgSbKxktAExSLUbltKWaoAV3hJ1QLIFEUWJf4p7BPBvSDejL6YJ/ycGGNPJ1rtuZA2RGPesCxFev9y8+g== X-Entity-ID: d/0VcHixlS0t7iB1YKCv4Q== 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:267861 Archived-At: Eli Zaretskii writes: >> From: Spencer Baugh >> Cc: monnier@iro.umontreal.ca, 64071@debbugs.gnu.org >> Date: Wed, 28 Jun 2023 08:48:38 -0400 >> >> > See above: we shouldn't change the read-only attribute that was set by >> > the user. >> >> Good point. How about this? > > Better, thanks. Is this patch OK to apply, then?