From unknown Fri Sep 05 08:57:51 2025 X-Loop: help-debbugs@gnu.org Subject: bug#50780: 28.0.50; [PATCH] Mention the 'r' key in ask-user-about-supersession-help Resent-From: Daniel =?UTF-8?Q?Mart=C3=ADn?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 24 Sep 2021 14:00:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50780 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 50780@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163249196624720 (code B ref -1); Fri, 24 Sep 2021 14:00:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 Sep 2021 13:59:26 +0000 Received: from localhost ([127.0.0.1]:58935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTljZ-0006Qe-LO for submit@debbugs.gnu.org; Fri, 24 Sep 2021 09:59:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:36296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTljX-0006QW-UU for submit@debbugs.gnu.org; Fri, 24 Sep 2021 09:59:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTljV-0000Jk-RG for bug-gnu-emacs@gnu.org; Fri, 24 Sep 2021 09:59:23 -0400 Received: from sonic312-25.consmr.mail.ir2.yahoo.com ([77.238.178.96]:37588) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTljR-0006k9-W1 for bug-gnu-emacs@gnu.org; Fri, 24 Sep 2021 09:59:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.es; s=s2048; t=1632491953; bh=7fAndipgFQJdOawKC8wqTD7NaXLpXePJcThSdSFlyCQ=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=BOoksUMdL64g1sYEsl7cxrYyaVCB6Ovs1MairOn1UAkLsKkgJstWkMVb43A5QZm5s+nRsocYX/Bm4lKlBq2t3S8ZJNWqkfLXnV/OP61YHXQX7oSZlvwaCsTvNn/gdUynYXdSVvvqCvSDB8lVS1bj02I5e5LwmmnC13m0/+pAdh+X82tY7tI3ZtlDOnzYkrh1TkALNSzlU92zB2krzilpr+PrYlzXcr3vm+A/Tr3xZEkU8gjsbcOXwvD5Gvc4fzyxM6wl9zwwjTZCraNvF8/1cfgnSA6GuC+zgpFbRq9ZZS44zjcVM4LiuQS7Pd8kYZcno/lxY6fWJWPy01bxMdSDow== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1632491953; bh=CRU5hwXGfrbqNxS0ct2McXheK1cmZh7Ho4MoqIzsfXr=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=W4KSbfbiU/lPSC+KjzNX5WcKI1zUYsDRtzQmsfHqw/LZerDCcf1+3KZR5unC918MyQv4dEiw8h42izsBQCNSHqONC7JDRIIlLYbTmZykC+UcVTRBQm70JLK/5+jv8O58ngLgV/u9mJ5kERi7W5cVZeGYxv4H0Td8OmZSpP3Bk+UwpOBTLgLhf6fSiZfdT15uiJgSkoF0kigqZ99+XLYXJqtLl7HxTQ7xSH71HPSzFU/A7WhkBwnkSGiRkUDteTuI/he7qGAYdyD1gqURD3/tS4cuMFggXJvThyI4TdR/oo9cg1OXL+Uarx4eukEvFhmBlX8j/rXsGdGTHyC4CZ86jA== X-YMail-OSG: vQIu6SwVM1mJ_6qxf4.nwBXGLZ_CbCZItiWHxmAkIzHOss3NJpPdn28qtVFa0SV 5Wsw3HY.PyukTtCoPUIik83ciblo404qVlG_7ArNaG9lrivqUGiB_lLkq27_dsF1iJsNTlgfSvQ4 FTR58kbTeqHojd9IlA2Kldo8r8fZUKWgwnz.x_vpiiTpTAsVEZcPNuTNKG51OSZB3472eEPLmZwR VWxC3nii6c1Kppr6Cuqx6H3u_zHPxqJcrIfcAdepLo5uVOM.AI2xK93U03bv6nhQ13zo3kxt2iJU KnufjvDUMlKXTxgBjLLzQoaEMVTKspPTiCUpnkIwWYQP5p.w0uZjc9glmgbiV5zCP1Bdvg1AWrjq Q1tB..GI8SHuyt44VNZ6kReY3CWFU2JK23ZZ1FxD1ZRVCnebgk5Yj8jCpGxlfTgEkwM7MBG9ddZb GLcPeLF7pT5dcfs42lHvqaoMN3WTzaJ2KeFE9jEdZ9YgYLsgm3aXYzTveXSJvje7COEUS.U.XmYW BF4sNUUSWnM1.R_tYMV8GwGO2DCp2Ca_MPX2Wn44vUdhZP2oV4JsJt8DFAPqy.baeNdKrgXqb7H0 dKZcjGqwxRzXNxefnaMttr4LplJiVqvaKBUCITpKM4sP3RsB8VRwtG.ugiWMnqJ4XGR1iv8LQ_Hs z_.vkf0qBzCRF52viMGGT_nIeW7sIjvCDu4FGWebbeExaaTOaVrtXkdXAd9aCKRier1en_Gbl5Lu ADlevM60lmIABjlmtoJ1UaXdGX9GfnYU2ez6tlMvQ9QJOKGGuqWbqn684WpwyAZ1Dez4xtv06h4I 4XB.Z8iibf7VJuj3WFGaayGwYxC0HlDGRXQn4OloQOzsTYCN05LmPuJ6s6gLUjme2OBWEvJXL.Jg Dsb8HC3h27NcECcSQUGAdaxcSL8vprA3yY1a9J0ra.UQbEsiCWGzWAZ1OQ4.sIrargDZWuGeftv2 LuheEBBdBzPna1suDmouvyHZj6c19gwnpkVkvQS38lnjyGWWtkZQaVNnskKeyYFNq54TGPkJm0qv 6DXqGn4Elfp6.pjdh6OCL4uxCJJ1_gZD3jLOavrCEavM8a7XE6lfl6UknXuF.6puA1dBBCdcxKq. 1CWnprnV1oNSyp6PIbsp3c4ZqAPsO0v5ZKr9pPBidWYzcoah3dgt2d93nGRPRNc.ZlbJ5ByeMdzn mGFtii.wt1QwZVIdL8tKVjFZCgy1Pgc0u9WhsQqPBekqA8h5fnpE2TWI.lFAxHm.b3S8JywIm78c guM0YRb5XtBHgCmFE1XXHqJF1rJHglrIxg9D5fJ.QTD6v0aC5e.Pf.bMK5m7uFFivCHf5B4IIj23 zlB5AzhMs3lu.YVrYXPdGG42qMth9Grx4CUjbi7Pm_9.eapQQwhMj5mDvKEjBdmB1UNEjXVYXMIE KqHKX9ZVmHls.eXAEjvpS94RvEV7Yqpocnn3wZJxMPjv_3yOmLI5JqQtWDmi91B0m3eOxJu3M_uB pHkQnwGwo4LrPj80TIYybIiFwns4s3nX8xaf.uVCt9cyda.WV_mg8thEofqrCaq4Z6NuJ0BsNjoh TMw9MkT34XjjeyhYrPQwrvgjLiGbsa05fHFy_1yJO7PZH9LLr6B12uBsSxW.I6grMxzUoMXi2eyq l9ECCg0XF7TCKdZ50GDoODltVXz1HXdRmzWD0oTuPuMHIyhxGmMXjGFgI0xIA8MKZouIoVgP27XK yLPZ_tW8Y_5NqpSdriP6iPrjUOCdCyyabLEoEUSl76pKET0RLpv2BZesQtRT.PFZ1D9gdfqxSgJi pkg2RveSyncnqPauay4l86VASKbmqLSDPihUnv7dWspleBwhbX2n6CfHnn1mJav8lDyh88RhQ0v5 Wwf5V_fuEGjOPWrTNZ6tKofUotM18itfqaqf1qFCRRmFzQw4Wz..CxynQuUokX2MOKR4fs1wYRFc pOELc_MjV8BDu_0oyWUOOMC5JIZCnFZV.wkNJ5w9MZ1yGKNGg70kfs5M1oslAXWXjcPcoLJn..Bu VYOtWf3rkDnbVIXEVfCNgOtltO46Q5zlkw_E7jBuFnKG8s8ebNCi2aLoD2.Agqe7CZC2pj3snA6z 6ZBcvuC6_yyoQ1tsFLO7llDhPOV6TqqeHzwh6kpvMRPwoqL6QqqEQaVOc0XNDgPh0jL3iS0wQKA0 VTJ5b9UIH_f0_GsJo0cUWG6fboRG1C3EfaRnNwH9fT5pEcjmrZPUVD5ZedG.eMg6m1W.nCrgMxAf 0oIMSzTdh5iIL8iGeXyPH7xNXMmCA8AV4pKL8yyao1A-- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.ir2.yahoo.com with HTTP; Fri, 24 Sep 2021 13:59:13 +0000 Received: by kubenode530.mail-prod1.omega.ir2.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 53b69dad520bd5fa367cfcd86540af43; Fri, 24 Sep 2021 13:59:09 +0000 (UTC) From: Daniel =?UTF-8?Q?Mart=C3=ADn?= Date: Fri, 24 Sep 2021 15:59:08 +0200 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" References: X-Mailer: WebService/1.1.19043 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Content-Length: 2695 Received-SPF: pass client-ip=77.238.178.96; envelope-from=mardani29@yahoo.es; helo=sonic312-25.consmr.mail.ir2.yahoo.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) 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 (--) --=-=-= Content-Type: text/plain When you edit a buffer whose underlying file has changed, Emacs presents a dialog to confirm if you really want to edit the buffer. The dialog, since 1996, offers to revert the file by pressing 'r', but the help message still mentions 'n' and then 'M-x revert'. As they are equivalent, the attached patch updates the help text to recommend pressing 'r'. Thanks. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Mention-the-r-key-in-ask-user-about-supersession-hel.patch >From b1e4985bb70ec820d59984e1bab8223c11de941a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Fri, 24 Sep 2021 15:32:01 +0200 Subject: [PATCH] Mention the 'r' key in ask-user-about-supersession-help * lisp/userlock.el (ask-user-about-supersession-help): Replace "n, and then M-x revert-buffer" in the help message with "r", which does the same thing. --- lisp/userlock.el | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/lisp/userlock.el b/lisp/userlock.el index a38f6ac422..87a8b7b451 100644 --- a/lisp/userlock.el +++ b/lisp/userlock.el @@ -201,13 +201,10 @@ ask-user-about-supersession-threat (defun ask-user-about-supersession-help () (with-output-to-temp-buffer "*Help*" - (let ((revert-buffer-binding - ;; This takes place in the original buffer. - (substitute-command-keys "\\[revert-buffer]"))) - (with-current-buffer standard-output - (insert - (format - "You want to modify a buffer whose disk file has changed + (with-current-buffer standard-output + (insert + (format + "You want to modify a buffer whose disk file has changed since you last read it in or saved it with this buffer. If you say %s to go ahead and modify this buffer, @@ -216,14 +213,13 @@ ask-user-about-supersession-help from the file on disk. If you say %s, the change you started to make will be aborted. -Usually, you should type %s and then %s, -to get the latest version of the file, then make the change again." - (userlock--fontify-key "y") - (userlock--fontify-key "r") - (userlock--fontify-key "n") - (userlock--fontify-key "n") - revert-buffer-binding)) - (help-mode))))) +Usually, you should type %s to get the latest version of the +file, then make the change again." + (userlock--fontify-key "y") + (userlock--fontify-key "r") + (userlock--fontify-key "n") + (userlock--fontify-key "r"))) + (help-mode)))) ;;;###autoload (defun userlock--handle-unlock-error (error) -- 2.31.0 --=-=-=-- From unknown Fri Sep 05 08:57:51 2025 X-Loop: help-debbugs@gnu.org Subject: bug#50780: 28.0.50; [PATCH] Mention the 'r' key in ask-user-about-supersession-help Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 25 Sep 2021 01:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50780 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Daniel =?UTF-8?Q?Mart=C3=ADn?= Cc: 50780@debbugs.gnu.org Received: via spool by 50780-submit@debbugs.gnu.org id=B50780.16325348852482 (code B ref 50780); Sat, 25 Sep 2021 01:55:03 +0000 Received: (at 50780) by debbugs.gnu.org; 25 Sep 2021 01:54:45 +0000 Received: from localhost ([127.0.0.1]:59792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTwto-0000dx-Kk for submit@debbugs.gnu.org; Fri, 24 Sep 2021 21:54:44 -0400 Received: from mail-pj1-f44.google.com ([209.85.216.44]:41579) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTwtm-0000dQ-J6 for 50780@debbugs.gnu.org; Fri, 24 Sep 2021 21:54:43 -0400 Received: by mail-pj1-f44.google.com with SMTP id pf3-20020a17090b1d8300b0019e081aa87bso8956029pjb.0 for <50780@debbugs.gnu.org>; Fri, 24 Sep 2021 18:54:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:in-reply-to:references:user-agent :mime-version:date:message-id:subject:to:cc :content-transfer-encoding; bh=5fAJ5jrQd2cgIFCR8xQyChs7QFXdm2zUbSld+Rdj9r4=; b=elP4OfMe2JfpRbhnAhW+hUU6NPBF6F3xLTh0NgBHtrLfPhTaWR+umnRz4JVoP9OYjm 07PWGAVAJsNCcu7ZuTzoxuUSkbypXXriBpTdsQko7zWj3GGWUTYEwbDuPzBx39q3RQpI awOAJNW9JWz0UpNjQQHy6B/sTrZr2IijzfqwydGCJ70YdFumYb3y3SHhuzLmrkQYJbUe 2Apt81ON3uSyeF8f8a2ZknRxH+vCkOGQi/05e8PAV9x0D9xOs9Aw2gF5XiDjQIlfW/r3 n6ZZu1D6/L+O7KxaEo242+pCzzZ1ZA/1n/eHs0QVGqddAFsZOJrzEgbhnTw/nmOyd+8J RBJQ== X-Gm-Message-State: AOAM531pCEEuKdGuJn4o4ynGXnVZJFJ3pm1ksqWC4ytLPFRT7XjybRqE pjuEiSwh+XJyzeMGQylWQ1njzdo1qDf/p7STpXDHME+m X-Google-Smtp-Source: ABdhPJx5JVnxYa0f+Dz/hHgcvYlbXE1LFbByyivMsx6q5hMmFSyNXD8pavcfJ1EmW1zFkEKQTbtCJRnEFODskePTMbw= X-Received: by 2002:a17:90a:460a:: with SMTP id w10mr5807506pjg.132.1632534876858; Fri, 24 Sep 2021 18:54:36 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Fri, 24 Sep 2021 18:54:36 -0700 From: Stefan Kangas In-Reply-To: ("Daniel =?UTF-8?Q?Mart=C3=ADn?="'s message of "Fri, 24 Sep 2021 15:59:08 +0200") References: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Date: Fri, 24 Sep 2021 18:54:36 -0700 Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.5 (/) 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: -0.5 (/) tags 50780 + fixed close 50780 28.1 thanks Daniel Mart=C3=ADn writes: > When you edit a buffer whose underlying file has changed, Emacs presents > a dialog to confirm if you really want to edit the buffer. The dialog, > since 1996, offers to revert the file by pressing 'r', but the help > message still mentions 'n' and then 'M-x revert'. As they are > equivalent, the attached patch updates the help text to recommend > pressing 'r'. That makes sense. Pushed to master as commit 67a0eee727. Thanks for the patch!