From unknown Thu Aug 14 18:37:10 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#64071 <64071@debbugs.gnu.org> To: bug#64071 <64071@debbugs.gnu.org> Subject: Status: 28.2; smerge-diff creates *vc-diff* without setting it up Reply-To: bug#64071 <64071@debbugs.gnu.org> Date: Fri, 15 Aug 2025 01:37:10 +0000 retitle 64071 28.2; smerge-diff creates *vc-diff* without setting it up reassign 64071 emacs submitter 64071 Spencer Baugh severity 64071 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 14 17:41:46 2023 Received: (at submit) by debbugs.gnu.org; 14 Jun 2023 21:41:46 +0000 Received: from localhost ([127.0.0.1]:45633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9YFO-0008CN-9e for submit@debbugs.gnu.org; Wed, 14 Jun 2023 17:41:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:54036) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9YFM-0008CF-9O for submit@debbugs.gnu.org; Wed, 14 Jun 2023 17:41:45 -0400 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 1q9YFM-0004iy-2O for bug-gnu-emacs@gnu.org; Wed, 14 Jun 2023 17:41:44 -0400 Received: from mxout1.mail.janestreet.com ([38.105.200.78]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9YFJ-0005ze-0U for bug-gnu-emacs@gnu.org; Wed, 14 Jun 2023 17:41:43 -0400 From: Spencer Baugh To: bug-gnu-emacs@gnu.org Subject: 28.2; smerge-diff creates *vc-diff* without setting it up Date: Wed, 14 Jun 2023 17:41:39 -0400 Message-ID: MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=38.105.200.78; envelope-from=sbaugh@janestreet.com; helo=mxout1.mail.janestreet.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) 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. Probably there is also other setup missing. 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 bug is also present in Emacs 29 and trunk. The below diff resolves the read-only part. But maybe we want to be creating the *vc-diff* by calling into vc, which would also fix the mode-line part? diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index c39a9cc2f22..65d93c17a64 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -1259,6 +1259,7 @@ smerge-diff (if (eq status 0) (insert "No differences found.\n")))) (goto-char (point-min)) (diff-mode) + (read-only-mode) (display-buffer (current-buffer) t)) (delete-file file1) (delete-file file2)))) In GNU Emacs 28.2 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo version 1.15.12, Xaw scroll bars) of 2023-02-09 built on Repository revision: 739b5d0e52d83ec567bd61a5a49ac0e93e0eb469 Repository branch: HEAD Windowing system distributor 'The X.Org Foundation', version 11.0.12011000 System Description: CentOS Linux 7 (Core) Configured using: 'configure --with-x-toolkit=lucid --without-gpm --without-gconf --without-selinux --without-imagemagick --with-modules --with-gif=no --with-cairo --with-rsvg' Configured features: CAIRO DBUS FREETYPE GLIB GMP GNUTLS GSETTINGS HARFBUZZ JPEG JSON LIBXML2 MODULES NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND THREADS TIFF TOOLKIT_SCROLL_BARS X11 XDBE XIM XPM LUCID ZLIB Important settings: value of $LANG: en_US.UTF-8 locale-coding-system: utf-8-unix Major mode: Text Minor modes in effect: smerge-mode: t tooltip-mode: t global-eldoc-mode: t show-paren-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t indent-tabs-mode: t transient-mark-mode: t Load-path shadows: None found. Features: (shadow sort mail-extr emacsbug message rmc puny dired dired-loaddefs rfc822 mml mml-sec epa derived epg rfc6068 epg-config gnus-util rmail rmail-loaddefs auth-source cl-seq eieio eieio-core cl-macs eieio-loaddefs password-cache json map text-property-search time-date subr-x seq byte-opt gv bytecomp byte-compile cconv mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader cl-loaddefs cl-lib sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils smerge-mode diff-mode easy-mmode diff iso-transl tooltip eldoc paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite emoji-zwj charscript charprop case-table epa-hook jka-cmpr-hook help simple abbrev obarray cl-preloaded nadvice button loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote threads dbusbind inotify dynamic-setting system-font-setting font-render-setting cairo x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 80621 6370) (symbols 48 11294 1) (strings 32 28957 2105) (string-bytes 1 956297) (vectors 16 13522) (vector-slots 8 187949 10390) (floats 8 30 39) (intervals 56 256 0) (buffers 992 12) (heap 1024 13825 2912)) From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 15 03:20:06 2023 Received: (at 64071) by debbugs.gnu.org; 15 Jun 2023 07:20:06 +0000 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 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 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==; 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 Date: Thu, 15 Jun 2023 10:20:18 +0300 Message-Id: <83ttv9tcnh.fsf@gnu.org> From: Eli Zaretskii To: Spencer Baugh , Stefan Monnier In-Reply-To: (message from Spencer Baugh on Wed, 14 Jun 2023 17:41:39 -0400) Subject: Re: bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up References: X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64071 Cc: 64071@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > 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. From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 15 11:09:16 2023 Received: (at 64071) by debbugs.gnu.org; 15 Jun 2023 15:09:16 +0000 Received: from localhost ([127.0.0.1]:47540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9ob6-0007bw-3K for submit@debbugs.gnu.org; Thu, 15 Jun 2023 11:09:16 -0400 Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:8130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9ob4-0007bg-KS for 64071@debbugs.gnu.org; Thu, 15 Jun 2023 11:09:15 -0400 Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 8E5291000CA; Thu, 15 Jun 2023 11:09:08 -0400 (EDT) Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 23D67100089; Thu, 15 Jun 2023 11:09:03 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1686841743; bh=emurp2WcT0COiydAlikR4HzHk12dIcu11ICiO/pal1I=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=YNlllqS6+Rid9mcuxfGSvN/ocbh5XrjtQd/++cUQgUl/7OpZxJ6sf3nNEGTBc2o5I 26+3hlcPq8X9ES8hU5bvZ9sOVdVH/a3VLkRi7xSUTY2i9K1TZkhUOGPNiJ5WYfgdYY Gp23n2hmdpCaBssNCbcNGqdjScjVJNMCKzajCeSBNF33UmZylJVmt/p5E5OARS0v0q FyBWlXy9PVBM5jw91BYWcjOoU2fU+5wgWHrLzW6GA8xLwbkUmv57edCMCN0sRyRxEb 0HpBDDWaIobMKkYTuiVgXsXH/syj5DF7ZPlYrH4MCY34MNvb6nsMLEBrP32omOhPNF u/7J2ayVwAjew== Received: from lechazo (lechon.iro.umontreal.ca [132.204.27.242]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 1517C120228; Thu, 15 Jun 2023 11:09:03 -0400 (EDT) From: Stefan Monnier To: Spencer Baugh Subject: Re: bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up In-Reply-To: (Spencer Baugh's message of "Wed, 14 Jun 2023 17:41:39 -0400") Message-ID: References: Date: Thu, 15 Jun 2023 11:09:02 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-SPAM-INFO: Spam detection results: 0 ALL_TRUSTED -1 Passed through trusted hosts only via SMTP AWL 0.075 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain T_SCC_BODY_TEXT_LINE -0.01 - X-SPAM-LEVEL: X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64071 Cc: 64071@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > 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. Probably there is > also other setup missing. Good catch, indeed. > 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. Hmm... that's also a bug, indeed. I'm tempted to say that maybe the bug is in the code which changed the `mode-line-format` (it should arguably either not change it, or arrange to have it reset when it doesn't match the buffer's contents any more). > This bug is also present in Emacs 29 and trunk. > > The below diff resolves the read-only part. But maybe we want to be > creating the *vc-diff* by calling into vc, which would also fix the > mode-line part? > > diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el > index c39a9cc2f22..65d93c17a64 100644 > --- a/lisp/vc/smerge-mode.el > +++ b/lisp/vc/smerge-mode.el > @@ -1259,6 +1259,7 @@ smerge-diff > (if (eq status 0) (insert "No differences found.\n")))) > (goto-char (point-min)) > (diff-mode) > + (read-only-mode) > (display-buffer (current-buffer) t)) > (delete-file file1) > (delete-file file2)))) LGTM. Stefan From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 27 16:17:53 2023 Received: (at 64071) by debbugs.gnu.org; 27 Jun 2023 20:17:53 +0000 Received: from localhost ([127.0.0.1]:49583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEF8L-0002SJ-EA for submit@debbugs.gnu.org; Tue, 27 Jun 2023 16:17:53 -0400 Received: from mxout5.mail.janestreet.com ([64.215.233.18]:37003) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEF8J-0002S4-QV for 64071@debbugs.gnu.org; Tue, 27 Jun 2023 16:17:53 -0400 From: Spencer Baugh To: Eli Zaretskii Subject: Re: bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up In-Reply-To: <83ttv9tcnh.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 15 Jun 2023 10:20:18 +0300") References: <83ttv9tcnh.fsf@gnu.org> Date: Tue, 27 Jun 2023 16:17:45 -0400 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64071 Cc: Stefan Monnier , 64071@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Eli Zaretskii writes: >> 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? Buffer named "*vc-diff*" are universally read-only, except if they are created through this path. (Because they're otherwise only created by vc, which marks them read-only.) It breaks user expectations for a *vc-diff* buffer to not be read-only. >> Probably there is also other setup missing. > > Which ones, and to what mode they belong? Setup done by vc when it creates *vc-diff* buffers. After doing a little investigation, it looks like the read-only setting is the most important divergence after all. Maybe we should be calling diff-setup-whitespace, and maybe we should be running vc-diff-finish-functions. Possibly not though. >> 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? Hm, honestly I only care about the read-only-mode, that's by far most confusing thing about this. I've gotten user complaints about that specifically being confusing, so that's what I'd like to fix. Stefan likes my simple patch, so what's wrong with it? From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 28 07:41:17 2023 Received: (at 64071) by debbugs.gnu.org; 28 Jun 2023 11:41:17 +0000 Received: from localhost ([127.0.0.1]:50139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qETXx-0004Aq-34 for submit@debbugs.gnu.org; Wed, 28 Jun 2023 07:41:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qETXu-0004Ab-KO for 64071@debbugs.gnu.org; Wed, 28 Jun 2023 07:41:15 -0400 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 1qETXo-0000JH-On; Wed, 28 Jun 2023 07:41:08 -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=bQ+ZQjlk2pnBdzj0NnUNZEZ2rO3kgZ/UKK2QO6UYw3I=; b=m0pt+b/Cz8M2 ySFMiefWuIoJynhuNKmFurbGEFqzQKJ2keEsP3hiLYJvbJyvK2o2SsmEft7Z497g0emiU9TzOkwZE lNHfcMww1mpNOZ26kBaf33bmtHqh4uqWBC2jlN5iDI2M1xa0OUzD4083MHp4aCXmCcfxO08z7VDvj dBCHR2M0lk6n0UcJSNAHyWJ2xB9Y3XQW5y3g1bIHKjaeSLLp1kqhArq/wLjvdDJGJzCBI/d33f8p8 A5GSdkQbF3pOuxgENGW+b3XRK/b2zfEL+4v6vJ6h6l+i3aii3jFDjSKnDpgCuwJU3bw6JJoBPZB33 NGGpsxSW1J3d3Ke0SKxOVg==; 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 1qETXo-00031M-7m; Wed, 28 Jun 2023 07:41:08 -0400 Date: Wed, 28 Jun 2023 14:41:33 +0300 Message-Id: <83pm5fvmoi.fsf@gnu.org> From: Eli Zaretskii To: Spencer Baugh In-Reply-To: (message from Spencer Baugh on Tue, 27 Jun 2023 16:17:45 -0400) Subject: Re: bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up References: <83ttv9tcnh.fsf@gnu.org> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64071 Cc: monnier@iro.umontreal.ca, 64071@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Spencer Baugh > Cc: Stefan Monnier , 64071@debbugs.gnu.org > Date: Tue, 27 Jun 2023 16:17:45 -0400 > > Eli Zaretskii writes: > > > That command enters diff-mode, and diff-mode doesn't force read-only > > status on the current buffer. Why should Smerge force that? > > Buffer named "*vc-diff*" are universally read-only, except if they are > created through this path. But users can legitimately make a *vc-diff* buffer modifiable, no? And your patch silently makes it read-only again, behind the user's back. That's hardly nice, is it? > Stefan likes my simple patch, so what's wrong with it? See above: we shouldn't change the read-only attribute that was set by the user. From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 28 08:48:46 2023 Received: (at 64071) by debbugs.gnu.org; 28 Jun 2023 12:48:46 +0000 Received: from localhost ([127.0.0.1]:50254 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEUbF-00064M-Ht for submit@debbugs.gnu.org; Wed, 28 Jun 2023 08:48:45 -0400 Received: from mxout5.mail.janestreet.com ([64.215.233.18]:53653) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEUbD-000645-NS for 64071@debbugs.gnu.org; Wed, 28 Jun 2023 08:48:44 -0400 From: Spencer Baugh To: Eli Zaretskii Subject: Re: bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up In-Reply-To: <83pm5fvmoi.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 28 Jun 2023 14:41:33 +0300") References: <83ttv9tcnh.fsf@gnu.org> <83pm5fvmoi.fsf@gnu.org> Date: Wed, 28 Jun 2023 08:48:38 -0400 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64071 Cc: monnier@iro.umontreal.ca, 64071@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> From: Spencer Baugh >> Cc: Stefan Monnier , 64071@debbugs.gnu.org >> Date: Tue, 27 Jun 2023 16:17:45 -0400 >> >> Eli Zaretskii writes: >> >> > That command enters diff-mode, and diff-mode doesn't force read-only >> > status on the current buffer. Why should Smerge force that? >> >> Buffer named "*vc-diff*" are universally read-only, except if they are >> created through this path. > > But users can legitimately make a *vc-diff* buffer modifiable, no? > And your patch silently makes it read-only again, behind the user's > back. That's hardly nice, is it? > >> Stefan likes my simple patch, so what's wrong with it? > > See above: we shouldn't change the read-only attribute that was set by > the user. Good point. How about this? --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Make-newly-created-smerge-diff-buffers-read-only.patch >From 4de911b6ed34ee1a728e1c57a65e9314f3785dc4 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Wed, 28 Jun 2023 08:48:01 -0400 Subject: [PATCH] Make newly-created smerge-diff-buffers read-only Buffers name *vc-diff* are usually created by vc, which makes them read-only. If we create such a buffer, let's make it read-only too. If the buffer already exists, though, don't change that since the user might have deliberately made it writable. * lisp/vc/smerge-mode.el (smerge-diff): Make newly-created smerge-diff-buffers read-only. (bug#64071) --- lisp/vc/smerge-mode.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index c39a9cc2f22..524a042fb55 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -1243,7 +1243,11 @@ smerge-diff (write-region beg1 end1 file1 nil 'nomessage) (write-region beg2 end2 file2 nil 'nomessage) (unwind-protect - (with-current-buffer (get-buffer-create smerge-diff-buffer-name) + (save-current-buffer + (if-let (buffer (get-buffer smerge-diff-buffer-name)) + (set-buffer buffer) + (set-buffer (get-buffer-create smerge-diff-buffer-name)) + (setq buffer-read-only t)) (setq default-directory dir) (let ((inhibit-read-only t)) (erase-buffer) -- 2.39.3 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 28 08:58:19 2023 Received: (at 64071) by debbugs.gnu.org; 28 Jun 2023 12:58:19 +0000 Received: from localhost ([127.0.0.1]:50276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEUkV-0006IQ-6h for submit@debbugs.gnu.org; Wed, 28 Jun 2023 08:58:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEUkT-0006ID-43 for 64071@debbugs.gnu.org; Wed, 28 Jun 2023 08:58:17 -0400 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 1qEUkN-00045H-73; Wed, 28 Jun 2023 08:58:11 -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=buqnGaOmrjmlzFOFgCRWY+74fxlfVewCmBy0Yy0BySI=; b=a3WZOhPaeNHr QH5Yqq6BQFzjBRGUPk3r40ArKXj/3c77uwtCWX0KYv+eXEk4Z3RYUyBvEDULg7vMeH8y8KBI6y9CD YAjQZriZRhgPNhNwvgeE6w9J6T/MADTPNrLMWo1yJdkwx8TIYySHNUTdhg8y3I9INvGWQ3RrRgHCB ilnijEySQex8Ig3WBd/ojcIxmIDMdvgelYhZo26Xuko13sLa3OPLHZVnxjii3GWfl7QPo/457BePS /HFQJ8FQXfmCMG9hwRGbIjjV9HTDUpspmJqE4TpFdu1ZeQ/X5ikgObo/qM3FUCtExZ/zXTbKhJLsr xGb5cvUg8nNrbrLcgokpvA==; 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 1qEUkI-0001mA-2f; Wed, 28 Jun 2023 08:58:10 -0400 Date: Wed, 28 Jun 2023 15:58:31 +0300 Message-Id: <83a5wjvj48.fsf@gnu.org> From: Eli Zaretskii To: Spencer Baugh In-Reply-To: (message from Spencer Baugh on Wed, 28 Jun 2023 08:48:38 -0400) Subject: Re: bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up References: <83ttv9tcnh.fsf@gnu.org> <83pm5fvmoi.fsf@gnu.org> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64071 Cc: monnier@iro.umontreal.ca, 64071@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > 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. From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 19 08:32:11 2023 Received: (at 64071) by debbugs.gnu.org; 19 Aug 2023 12:32:11 +0000 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 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== 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 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 Received: from localhost (localhost [IPv6:::1]) by earth.catern.com (Postfix) with ESMTPSA id 1510B6015C; Sat, 19 Aug 2023 08:32:01 -0400 (EDT) From: sbaugh@catern.com Subject: Re: bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up In-Reply-To: <83a5wjvj48.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 28 Jun 2023 15:58:31 +0300") References: <83ttv9tcnh.fsf@gnu.org> <83pm5fvmoi.fsf@gnu.org> <83a5wjvj48.fsf@gnu.org> Date: Sat, 19 Aug 2023 12:32:01 +0000 (UTC) Message-ID: <87pm3jgqm6.fsf@catern.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-SG-EID: =?us-ascii?Q?ZgbRq7gjGrt0q=2FPjvxk7wM0yQFRdOkTJAtEbkjCkHbIwHD2ndIRL6u5vuupkDx?= =?us-ascii?Q?zXDElFyeRJhZz8+26394g00uz0S1vjPvoTqo9jL?= =?us-ascii?Q?rqalUAophMx3py0nxtqhN3X7VCrP1wKUBgSbKxk?= =?us-ascii?Q?tAExSLUbltKWaoAV3hJ1QLIFEUWJf4p7BPBvSDe?= =?us-ascii?Q?jL6YJ=2FycGGNPJ1rtuZA2RGPesCxFev9y8+g=3D=3D?= To: Eli Zaretskii X-Entity-ID: d/0VcHixlS0t7iB1YKCv4Q== Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64071 Cc: Spencer Baugh , monnier@iro.umontreal.ca, 64071@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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? From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 19 08:48:18 2023 Received: (at 64071) by debbugs.gnu.org; 19 Aug 2023 12:48:18 +0000 Received: from localhost ([127.0.0.1]:49677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXLNK-000631-9O for submit@debbugs.gnu.org; Sat, 19 Aug 2023 08:48:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXLNH-00062D-Px for 64071@debbugs.gnu.org; Sat, 19 Aug 2023 08:48:16 -0400 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 1qXLN9-0006br-GB; Sat, 19 Aug 2023 08:48:08 -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=P46mqUzyysSiF3tdx1Rm08vgxHr5wf9zlDa41STjwM8=; b=J8Zan1q7Yq7r uxQIltYlXwr1Bk/wX70CqUZO2azcriX/8aSkENef2FOSQeO3y7KeFBDrEClfN+aTE6SFmxOfs00VQ tWwPiKUvt8F6G9DERwBknj37hWAnb9THYHqkx345UKFuzvK3JL2+ZaDiTpejZz6+ZrH8us/MOMfnF onEmoa0n+tiEjNyhwQXjFV9HRnQObgxpzpIDVkOs2a8+y3RKd8eadG28sJ1nCUdOjwuDP993s/rPM PcR0cJ8ALTzDujKXFUjca1NdAMaWnyT66eGisd/fxXtWIy8oXJO50sXay/Rxvb+WdHuHvd877AmMW h4+8dP5gK5Rod7m2ki2B5w==; Date: Sat, 19 Aug 2023 15:48:20 +0300 Message-Id: <83cyzjyz8r.fsf@gnu.org> From: Eli Zaretskii To: sbaugh@catern.com In-Reply-To: <87pm3jgqm6.fsf@catern.com> (sbaugh@catern.com) Subject: Re: bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up References: <83ttv9tcnh.fsf@gnu.org> <83pm5fvmoi.fsf@gnu.org> <83a5wjvj48.fsf@gnu.org> <87pm3jgqm6.fsf@catern.com> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64071 Cc: monnier@iro.umontreal.ca, 64071@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > 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. From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 10:05:52 2023 Received: (at 64071) by debbugs.gnu.org; 4 Oct 2023 14:05:52 +0000 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 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 From: Spencer Baugh To: Eli Zaretskii Subject: Re: bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up In-Reply-To: <83cyzjyz8r.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 19 Aug 2023 15:48:20 +0300") References: <83ttv9tcnh.fsf@gnu.org> <83pm5fvmoi.fsf@gnu.org> <83a5wjvj48.fsf@gnu.org> <87pm3jgqm6.fsf@catern.com> <83cyzjyz8r.fsf@gnu.org> Date: Wed, 04 Oct 2023 10:05:26 -0400 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64071 Cc: sbaugh@catern.com, monnier@iro.umontreal.ca, 64071@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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? From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 04:06:30 2023 Received: (at 64071-done) by debbugs.gnu.org; 5 Oct 2023 08:06:30 +0000 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 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 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==; Date: Thu, 05 Oct 2023 11:06:10 +0300 Message-Id: <83bkdd4hot.fsf@gnu.org> From: Eli Zaretskii To: Spencer Baugh In-Reply-To: (message from Spencer Baugh on Wed, 04 Oct 2023 10:05:26 -0400) Subject: Re: bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up References: <83ttv9tcnh.fsf@gnu.org> <83pm5fvmoi.fsf@gnu.org> <83a5wjvj48.fsf@gnu.org> <87pm3jgqm6.fsf@catern.com> <83cyzjyz8r.fsf@gnu.org> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64071-done Cc: sbaugh@catern.com, monnier@iro.umontreal.ca, 64071-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > 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. From unknown Thu Aug 14 18:37:10 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 02 Nov 2023 11:24:12 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator