From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Spencer Baugh Newsgroups: gmane.emacs.bugs Subject: bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up Date: Wed, 04 Oct 2023 10:05:26 -0400 Message-ID: References: <83ttv9tcnh.fsf@gnu.org> <83pm5fvmoi.fsf@gnu.org> <83a5wjvj48.fsf@gnu.org> <87pm3jgqm6.fsf@catern.com> <83cyzjyz8r.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18324"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: sbaugh@catern.com, 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 Wed Oct 04 16:06:01 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 1qo2Vk-0004PT-SY for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 04 Oct 2023 16:06:00 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qo2VV-00059j-Vj; Wed, 04 Oct 2023 10:05:46 -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 1qo2VU-00057J-VX for bug-gnu-emacs@gnu.org; Wed, 04 Oct 2023 10:05:44 -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 1qo2VU-000777-NF for bug-gnu-emacs@gnu.org; Wed, 04 Oct 2023 10:05:44 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qo2Vm-0002Cc-6t for bug-gnu-emacs@gnu.org; Wed, 04 Oct 2023 10:06:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Spencer Baugh Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 04 Oct 2023 14:06: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.16964283528448 (code B ref 64071); Wed, 04 Oct 2023 14:06:02 +0000 Original-Received: (at 64071) by debbugs.gnu.org; 4 Oct 2023 14:05:52 +0000 Original-Received: from localhost ([127.0.0.1]:45069 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo2Vc-0002CC-8V for submit@debbugs.gnu.org; Wed, 04 Oct 2023 10:05:52 -0400 Original-Received: from mxout5.mail.janestreet.com ([64.215.233.18]:33765) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo2VZ-0002Bz-VZ for 64071@debbugs.gnu.org; Wed, 04 Oct 2023 10:05:50 -0400 In-Reply-To: <83cyzjyz8r.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 19 Aug 2023 15:48:20 +0300") 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:271803 Archived-At: Eli Zaretskii writes: >> From: sbaugh@catern.com >> Date: Sat, 19 Aug 2023 12:32:01 +0000 (UTC) >> Cc: Spencer Baugh , monnier@iro.umontreal.ca, >> 64071@debbugs.gnu.org >> >> 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? > > Yes, I think so. Could it be applied, then?