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, 05 Oct 2023 11:06:10 +0300 Message-ID: <83bkdd4hot.fsf@gnu.org> References: <83ttv9tcnh.fsf@gnu.org> <83pm5fvmoi.fsf@gnu.org> <83a5wjvj48.fsf@gnu.org> <87pm3jgqm6.fsf@catern.com> <83cyzjyz8r.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="367"; mail-complaints-to="usenet@ciao.gmane.io" Cc: sbaugh@catern.com, monnier@iro.umontreal.ca, 64071-done@debbugs.gnu.org To: Spencer Baugh Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Oct 05 10:06:50 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 1qoJNi-000ALO-76 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 05 Oct 2023 10:06:50 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoJNd-00072U-Tr; Thu, 05 Oct 2023 04:06:45 -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 1qoJNc-000719-PH for bug-gnu-emacs@gnu.org; Thu, 05 Oct 2023 04:06: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 1qoJNc-0003qL-5i for bug-gnu-emacs@gnu.org; Thu, 05 Oct 2023 04:06:44 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoJNu-0006Kn-6z for bug-gnu-emacs@gnu.org; Thu, 05 Oct 2023 04:07:02 -0400 Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Thu, 05 Oct 2023 08:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 64071 X-GNU-PR-Package: emacs Mail-Followup-To: 64071@debbugs.gnu.org, eliz@gnu.org, sbaugh@janestreet.com Original-Received: via spool by 64071-done@debbugs.gnu.org id=D64071.169649319024297 (code D ref 64071); Thu, 05 Oct 2023 08:07:01 +0000 Original-Received: (at 64071-done) by debbugs.gnu.org; 5 Oct 2023 08:06:30 +0000 Original-Received: from localhost ([127.0.0.1]:45984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoJNN-0006Jp-Vi for submit@debbugs.gnu.org; Thu, 05 Oct 2023 04:06:30 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoJNL-0006Jb-Am for 64071-done@debbugs.gnu.org; Thu, 05 Oct 2023 04:06:28 -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 1qoJMx-0003h3-KY; Thu, 05 Oct 2023 04:06:03 -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=pNr6Dtrv4vrpZqvtGp1NlbHmg2pXItCc6K7CUzmsJkA=; b=n7A1FIEG3M5o apceiJ7bOFH8yPizMPnHmeiBQ2LfbunK7F9/a6Q7FrTpW0p1YxUd0ysD8bA+gaSDOVorFbsxEeL+I sJfVeW3P6kcV+6JNlKREjgKqpH0QU8H8ltxWDOluECLsFnFPaZrDKX9zrXXAGqfEOmry8Gx7+2JyI LMotRXOA3BEPJBO28GK84vzmlsHQwoypEMorT6VBoZyMD4235BxgoZQ2Bh6PNMVObuosMsNwfP42I ZImq8f5NV+fHccuSIL5g0+YUuysH4GG6456aHxwCB6C8j06fxGSu3cNXy2szijxxOZqeeoBx7AFUw LHLsMWjpX+LVJnH0f7+KUw==; In-Reply-To: (message from Spencer Baugh on Wed, 04 Oct 2023 10:05:26 -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:271854 Archived-At: > From: Spencer Baugh > Cc: sbaugh@catern.com, monnier@iro.umontreal.ca, 64071@debbugs.gnu.org > Date: Wed, 04 Oct 2023 10:05:26 -0400 > > 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? Installed on master, and closing the bug.