From unknown Wed Jun 18 23:14:41 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#52242 <52242@debbugs.gnu.org> To: bug#52242 <52242@debbugs.gnu.org> Subject: Status: 29.0.50; Feature Request: Offer to run`diff-buffer-with-file' in `recover-this-file' prompt Reply-To: bug#52242 <52242@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:14:41 +0000 retitle 52242 29.0.50; Feature Request: Offer to run`diff-buffer-with-file= ' in `recover-this-file' prompt reassign 52242 emacs submitter 52242 Visuwesh severity 52242 wishlist thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 02 07:28:35 2021 Received: (at submit) by debbugs.gnu.org; 2 Dec 2021 12:28:35 +0000 Received: from localhost ([127.0.0.1]:46919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mslCV-0002Ff-3l for submit@debbugs.gnu.org; Thu, 02 Dec 2021 07:28:35 -0500 Received: from lists.gnu.org ([209.51.188.17]:32888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mslCR-0002FV-FR for submit@debbugs.gnu.org; Thu, 02 Dec 2021 07:28:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mslCR-0002ey-7t for bug-gnu-emacs@gnu.org; Thu, 02 Dec 2021 07:28:31 -0500 Received: from w1.tutanota.de ([81.3.6.162]:53692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mslCM-0004iw-T9 for bug-gnu-emacs@gnu.org; Thu, 02 Dec 2021 07:28:30 -0500 Received: from w3.tutanota.de (unknown [192.168.1.164]) by w1.tutanota.de (Postfix) with ESMTP id 55A74FBF86F for ; Thu, 2 Dec 2021 12:28:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1638448104; s=s1; d=tutanota.com; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=cX91pScdkCWBpUeDg9fOPlDMsdy7HtyzXOl175tZwcI=; b=fEEp9TxKlE9o0ZdjeZDfU/P5Md8kxDuen2Ou/WPgbRSk5DWGNQWca0QqTtRVGKCx 66pS5dfofRvS8+DK9K6Kv57E6GEz5128WHonhseu2RaN1s5eCPH+dEBYItSeS47t8xx xC7kcxhzf0+6xXHVjgtSlFfoPBNJXj6h+h+qYknv7NmX6afLqFWuruYdrqG/WMLpao4 A7MPWo7Ih1DD/vRGqbr5i4gJWa8nXqmqRtsrvTfdY3xavTu33B1kA4ggAlSTgLSsbOF MutwA5EUu9nMnzTTwrHeG36v+U053s5UHa03CYfx6mZfyCSXML1fM/AzIX2vDzOXQ70 xcaQeDFH3g== Date: Thu, 2 Dec 2021 13:28:24 +0100 (CET) From: Visuwesh To: Bug Gnu Emacs Message-ID: Subject: 29.0.50; Feature Request: Offer to run`diff-buffer-with-file' in `recover-this-file' prompt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=81.3.6.162; envelope-from=visuwesh@tutanota.com; helo=w1.tutanota.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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 (--) `recover-this-file' quite helpfully shows the time of creation of the auto-save file.=C2=A0 However, this is not always enough to decide whether = I should recover from said auto-save file since there's no way of knowing if the changes in auto-save file are desirable [1] so I end up answering yes, then run `diff-buffer-with-file' anyway.=C2=A0 I think having a `diff-buffer-with-file' option like `save-some-buffers' would be a quality-of-life improvement. Thanks. [1] I fat finger my keyboard quite a lot and end up garbling the file even after explicitly saving the buffer.=C2=A0 When I open the file in a ne= w Emacs session again, I get suggested to `recover-this-file' and 8/10 times, I have to undo.=C2=A0 Having a diff option directly in the prompt would save some keystrokes. In GNU Emacs 29.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.24.27, c= airo version 1.16.0) Repository revision: da67e888d5360297cdf20cd3d2a1148727d16e5a Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12012000 System Description: NixOS 21.11 (Porcupine) Configured using: 'configure --prefix=3D/nix/store/mlv737k3wph8lhxi2lm9942kbm31wmdz-emacs-gcc-20211030.0 --disable-build-details --with-modules --with-x-toolkit=3Dgtk3 --with-xft --with-cairo --with-native-compilation' Configured features: CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GSETTINGS HARFBUZZ JPEG JSON LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES NATIVE_COMP NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND THREADS TIFF TOOLKIT_SCROLL_BARS X11 XDBE XIM XPM GTK3 ZLIB Important settings: =C2=A0 value of $EMACSLOADPATH: =C2=A0 value of $EMACSNATIVELOADPATH: /nix/store/hagxad2bnmdwy79yjkvkwjjynx= pik7fw-emacs-packages-deps/share/emacs/native-lisp:: =C2=A0 value of $LANG: en_GB.UTF-8 =C2=A0 locale-coding-system: utf-8-unix Major mode: Lisp Interaction Minor modes in effect: =C2=A0 TeX-PDF-mode: t =C2=A0 recentf-mode: t =C2=A0 paredit-mode: t =C2=A0 eros-mode: t =C2=A0 flymake-mode: t =C2=A0 hl-todo-mode: t =C2=A0 pdf-occur-global-minor-mode: t =C2=A0 shell-dirtrack-mode: t =C2=A0 minibuffer-depth-indicate-mode: t =C2=A0 repeat-mode: t =C2=A0 display-time-mode: t =C2=A0 display-battery-mode: t =C2=A0 straight-use-package-mode: t =C2=A0 straight-package-neutering-mode: t =C2=A0 tooltip-mode: t =C2=A0 global-eldoc-mode: t =C2=A0 eldoc-mode: t =C2=A0 show-paren-mode: t =C2=A0 electric-indent-mode: t =C2=A0 mouse-wheel-mode: t =C2=A0 file-name-shadow-mode: t =C2=A0 global-font-lock-mode: t =C2=A0 font-lock-mode: t =C2=A0 auto-composition-mode: t =C2=A0 auto-encryption-mode: t =C2=A0 auto-compression-mode: t =C2=A0 transient-mark-mode: t =C2=A0 abbrev-mode: t Load-path shadows: /home/viz/.nix-profile/share/emacs/site-lisp/site-start hides /nix/store/ha= gxad2bnmdwy79yjkvkwjjynxpik7fw-emacs-packages-deps/share/emacs/site-lisp/si= te-start /home/viz/lib/emacs/straight/build/map/map hides /nix/store/mlv737k3wph8lhx= i2lm9942kbm31wmdz-emacs-gcc-20211030.0/share/emacs/29.0.50/lisp/emacs-lisp/= map /home/viz/lib/emacs/straight/build/let-alist/let-alist hides /nix/store/mlv= 737k3wph8lhxi2lm9942kbm31wmdz-emacs-gcc-20211030.0/share/emacs/29.0.50/lisp= /emacs-lisp/let-alist Features: (shadow sort emacsbug sendmail reporter preview tex-buf latex-mode-expansions latex latex-flymake tex-ispell tex-style tex crm trace edebug hippie-exp re-builder holidays hol-loaddefs cal-move autoload math-delimiters cursor-sensor org-pdftools pdf-annot facemenu org-noter executable time-stamp comp comp-cstr cl-print debug backtrace thai-util thai-word misearch multi-isearch view mule-util ement-room-list ement ement-notify ement-room ewoc ement-api ement-structs ement-macros plz dns ts s etags fileloop xref rect mail-extr wdired dired-aux shortdoc dired-x help-fns radix-tree expand-region text-mode-expansions cc-mode-expansions the-org-mode-expansions er-basic-expansions expand-region-core expand-region-custom pulse color reveal recentf tree-widget vc-git diff-mode vc-dispatcher server paredit edmacro kmacro eros checkdoc lisp-mnt flymake-proc flymake project hl-todo writegood-mode-autoloads ement-autoloads ts-autoloads s-autoloads map-autoloads plz-autoloads transmission-autoloads lua-mode-autoloads nix-mode-autoloads magit-section-autoloads racket-mode-autoloads eros-autoloads flymake-shellcheck-autoloads avy avy-autoloads siege-mode siege-mode-autoloads paredit-autoloads expand-region-autoloads filladapt-autoloads compose quail notifications org-capture doct warnings org-refile org-clock scroll-other-window org-pdftools-autoloads org-noter-autoloads finder-inf pdf-occur ibuf-ext ibuffer ibuffer-loaddefs tablist tablist-filter semantic/wisent/comp semantic/wisent semantic/wisent/wisent semantic/util-modes semantic/util semantic semantic/tag semantic/lex semantic/fw mode-local cedet pdf-isearch let-alist pdf-misc imenu pdf-tools package url-handlers compile cus-edit pdf-view bookmark pp pdf-cache pdf-info tq pdf-util pdf-macs pdf-tools-autoloads let-alist-autoloads tablist-autoloads math-delimiters-autoloads doct-autoloads valign flyspell ispell face-remap goto-addr org-indent org-num org-element avl-tree generator ol-eww eww xdg url-queue thingatpt mm-url ol-rmail ol-mhe ol-irc ol-info ol-gnus nnselect gnus-search eieio-opt speedbar ezimage dframe gnus-art mm-uu mml2015 mm-view mml-smime smime dig gnus-sum shr kinsoku svg dom browse-url gnus-group gnus-undo gnus-start gnus-dbus gnus-cloud nnimap nnmail mail-source utf7 netrc nnoo parse-time gnus-spec gnus-int gnus-range message rmc puny rfc822 mml mml-sec epa epg rfc6068 epg-config mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader gnus-win gnus nnheader gnus-util rmail rmail-loaddefs rfc2047 rfc2045 ietf-drums text-property-search mail-utils mm-util mail-prsvr wid-edit ol-docview doc-view jka-compr image-mode exif dired dired-loaddefs ol-bibtex ol-bbdb ol-w3m ol-doi org-link-doi ob-C cc-mode cc-fonts cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs ob-shell shell ob-racket dash async ob-async org-starless cdlatex texmathp org ob ob-tangle ob-ref ob-lob ob-table ob-exp org-macro org-footnote org-src ob-comint org-pcomplete pcomplete comint ansi-color ring org-list org-faces org-entities noutline outline org-version ob-emacs-lisp ob-core ob-eval org-table oc-basic bibtex iso8601 time-date ol org-keys oc org-compat advice org-macs org-loaddefs find-func ob-async-autoloads dash-autoloads async-autoloads emacs-ob-racket-autoloads valign-autoloads easy-mmode org-starless-autoloads cdlatex-autoloads auctex-autoloads tex-site tempo derived mb-depth cus-load repeat visual-fill-autoloads olivetti-autoloads hl-todo-autoloads moody-autoloads time format-spec battery dbus filenotify xml disp-table vz-nh-theme shell-command+ shell-command-plus-autoloads icalendar diary-lib diary-loaddefs cal-menu calendar cal-loaddefs url url-proxy url-privacy url-expand url-methods url-history url-cookie url-domsuf url-util url-parse auth-source eieio eieio-core eieio-loaddefs password-cache json map url-vars mailcap rx chemtable chemtable-autoloads molar-mass-autoloads pcase straight-autoloads info cl-seq cl-extra help-mode straight cl-macs cl-loaddefs cl-lib seq gv subr-x byte-opt bytecomp byte-compile cconv 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 move-toolbar gtk x-toolkit x multi-tty make-network-process native-compile emacs) Memory information: ((conses 16 1208185 292637) (symbols 48 42228 4) (strings 32 303314 43731) (string-bytes 1 8562492) (vectors 16 108614) (vector-slots 8 2355085 365629) (floats 8 691 1499) (intervals 56 52079 12887) (buffers 992 50)) From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 15 05:14:42 2022 Received: (at control) by debbugs.gnu.org; 15 Jan 2022 10:14:42 +0000 Received: from localhost ([127.0.0.1]:39146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8g54-0005Gi-0V for submit@debbugs.gnu.org; Sat, 15 Jan 2022 05:14:42 -0500 Received: from quimby.gnus.org ([95.216.78.240]:47764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8g52-0005GS-Ct for control@debbugs.gnu.org; Sat, 15 Jan 2022 05:14:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=2FIQO5sg+KHTmKNzWoi5kQIj+Iqo9oYaiB09ATeEnZo=; b=PaFEV94+i/t5wkrIzu5s0zZSev oirFG3tRH17BSnidA/+9i3QWQlnTicu5cI+thK9BEkgipXhnb1VAh5MLJkyIVPiTeL9uWldxzU39m GoAwh7WPAHXWSakmS9sthHSewZZBOO5dSm+M4fmiSkpDLpzUOaWM2MfFCnW/TS4KnTzE=; Received: from [84.212.220.105] (helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1n8g4u-0003Si-Kp for control@debbugs.gnu.org; Sat, 15 Jan 2022 11:14:34 +0100 Date: Sat, 15 Jan 2022 11:14:30 +0100 Message-Id: <871r19wbjt.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #53280 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: forcemerge 53280 52242 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control 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 (---) forcemerge 53280 52242 quit From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 02 12:08:32 2022 Received: (at control) by debbugs.gnu.org; 2 Oct 2022 16:08:32 +0000 Received: from localhost ([127.0.0.1]:47873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1of1W4-0004Sj-4w for submit@debbugs.gnu.org; Sun, 02 Oct 2022 12:08:32 -0400 Received: from mail-oo1-f42.google.com ([209.85.161.42]:37806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1of1W1-0004SO-IG for control@debbugs.gnu.org; Sun, 02 Oct 2022 12:08:30 -0400 Received: by mail-oo1-f42.google.com with SMTP id h1-20020a4aa741000000b004756c611188so5379738oom.4 for ; Sun, 02 Oct 2022 09:08:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date; bh=rmmEzbtF4ZCQP9TKDMDwcBarYKj2Pv2MS7lCLhBeknE=; b=FHVFyGyX27DcXHNFnugcSxtdTYg9ipL1mE+gdBM8oyk+O2bVR+Ay7zfJGXG34dqvks NcHbbusF10HNAbPt5hvjqQ8ePTCtY44wIQCBmax6nT/xHjAQrbuICCMtTDHWNpf/FIMZ jKvm6T3hQ+nNCVkwbCbNzn3U6Do1nZ6R1MgFMyNJJJZgNiQtuvuQxPOL4CbRBJbbROET eFiOXKgFcUTsRUcwmS89NtwqUE+OiMz7ZPOYnroXnd197Gb5+h6OA4iv2OxQ/kgJVapz OaOAYxdc59S5Pn1M9SfaKGJqdGF2JEDCdU/0iEx8HX2eui4zEQ2gu0XaS2GD97Iv0yYm YaPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date; bh=rmmEzbtF4ZCQP9TKDMDwcBarYKj2Pv2MS7lCLhBeknE=; b=Xd3WK3eYkRgwGX2JBpBo0lFXPkmh3jQysiJkyRDKLebOmwg+wdCR6H9FElXIZuhCb2 bxQo05Tj4a3NDxuV94kio9V4IHOvrtdpj/4X9x7aE37DAPfk2DBXcAiphVPg+AB6cxUy CfhlKCMJliXRaReiZ1/+xPuSQYnx9FQXtMANJe3TNtfnBzmfOls2BGNp7FQCmXCrfiCy lWQR5nrFWSKGO4KB0RJzYREa3IlubtqKYgDcWHY1k0hkLwO2owQ/bRzX/ou9qFFzLPvb wYXxjEl8GEN5bC++gefvTH/+S0Aa0TDTLld5T9EkSw+vufIJI/3UfVoqx2EWhzkIhy0+ ISgg== X-Gm-Message-State: ACrzQf1PcoSs86Ki7xPay+cPDgmyJmbMu7iLFIi6vaeZj6rQ8hrLShej Mae+rC3lRzqvHJb3I4q85BgoC6HK+efzEGZ/3+M= X-Google-Smtp-Source: AMsMyM4uXHzuA7Q1m3GPHWNbPT3zUKVg4GpDxMWGzlbkIef1U8qEZUKDevnbk1oMzQewyAXlO/ouObMWcyi3KAOmBaI= X-Received: by 2002:a05:6830:3c1:b0:637:28be:7920 with SMTP id p1-20020a05683003c100b0063728be7920mr6585062otc.105.1664726904041; Sun, 02 Oct 2022 09:08:24 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sun, 2 Oct 2022 09:08:23 -0700 From: Stefan Kangas In-Reply-To: <877d1i5ian.fsf@gmail.com> References: <877d1i5ian.fsf@gmail.com> X-Hashcash: 1:20:221002:58253@debbugs.gnu.org::QmLXN2QUBWND1LDU:7ODU MIME-Version: 1.0 Date: Sun, 2 Oct 2022 09:08:23 -0700 Message-ID: Subject: Re: bug#58253: Add a command to show a diff before `M-x recover-this-file' To: Visuwesh Content-Type: text/plain; charset="UTF-8" Bcc: control@debbugs.gnu.org X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control Cc: 58253@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 (-) forcemerge 52242 58253 thanks Visuwesh writes: > I think this is another duplicate of bug#52242. I think that's correct, so I've merged them. From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 06 03:23:24 2023 Received: (at 52242) by debbugs.gnu.org; 6 Dec 2023 08:23:24 +0000 Received: from localhost ([127.0.0.1]:38815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rAnBk-0000kJ-Dq for submit@debbugs.gnu.org; Wed, 06 Dec 2023 03:23:24 -0500 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:56396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rAnBg-0000k4-MV for 52242@debbugs.gnu.org; Wed, 06 Dec 2023 03:23:23 -0500 Received: by mail-pl1-x642.google.com with SMTP id d9443c01a7336-1d069b1d127so26640155ad.0 for <52242@debbugs.gnu.org>; Wed, 06 Dec 2023 00:23:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701850983; x=1702455783; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=M6erJLn8akfWMzYMYynNXSeLnGaZOeekMZrr6PYVwRc=; b=W6jEg7fRDTttiueSA8m/HrpYbUNrDbw/E0M438MN8+bxUviDWf+Yd7ZazVCRUsS+a8 Qx7ZUaQEQdr++Voyk+1W2Bb3OepfASrMCtO291UHs9OX2JRP19KN/82ws3cE0nrWnYwL woaQV6nh4LOLvwGy8HV2tfVE/nQHO8GlQkvIAUrOBNP30cbQHoB6viMXIhbbw1f7snCF tOQaf4cZhog9N0P9+v7NlMU+jQYvMqYaVlwn2m0hrdsjv5swb8vE2uQVqr00haBuySnf VCLFAJXaNup4ZrVw8yz0tQ3w7hweeqrCCB/RqEAVfceGCVKyLb3SGDxl8GXnFx76oVPL ilzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701850983; x=1702455783; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=M6erJLn8akfWMzYMYynNXSeLnGaZOeekMZrr6PYVwRc=; b=TA87Cmgq7JSksVOuebOdWZPt7rpumNHJ0rLnbgTKETs/161B5hlGw5TEzmOWuQRPxN 9s5aVMRCMcdxmfAcfBgu/hhg3o7VY756+4++PHBH1/HKYCFImawasYKkzqhZNkf2Q2z0 7rLYpmHBeKnRqrjrzV//jeBINziTFmXTBWKLSPfM47yjWZ7IUiwrPRkBCLTiayPSY+JP m7FT7DjYoFhv+eDM5ydGkMRF8HqysQO7mJK8F5dzSsiHg+8+5o5gJsCpvBIddM0t9XNs vHdXTo7UaMdG8QhsY8CPwDRQK3m10/Ag4duF7C32yhXirCjLJz21PewLUoSsvliBT2WX 9GzA== X-Gm-Message-State: AOJu0YxZ7sfa2dmCLxgO0VnF3YS+UipBm14Qdj5aLvM/mE1Gw7TP8+Mk /mwcvBO4P8uzBl6LfkQzm7cUucYOxfHKWQ== X-Google-Smtp-Source: AGHT+IEAqXDWfoQhxmgGml60ouTCKj3KwLuD+Ead2ghmLQUyI1wDkJm8hrXHMZk3YlWgD0/Qo2jaUw== X-Received: by 2002:a17:902:e846:b0:1d0:c7c6:91a2 with SMTP id t6-20020a170902e84600b001d0c7c691a2mr322056plg.100.1701850982822; Wed, 06 Dec 2023 00:23:02 -0800 (PST) Received: from localhost ([115.240.90.130]) by smtp.gmail.com with ESMTPSA id l6-20020a170903244600b001cf658f20ecsm7606574pls.96.2023.12.06.00.23.01 for <52242@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 00:23:01 -0800 (PST) From: Visuwesh To: 52242@debbugs.gnu.org Subject: Re: bug#52242: 29.0.50; Feature Request: Offer to run`diff-buffer-with-file' in `recover-this-file' prompt In-Reply-To: (visuwesh@tutanota.com's message of "Thu, 2 Dec 2021 13:28:24 +0100 (CET)") References: Date: Wed, 06 Dec 2023 13:52:59 +0530 Message-ID: <8734wfwxi4.fsf@gmail.com> 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: 52242 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; charset=utf-8 Content-Transfer-Encoding: quoted-printable [=E0=AE=B5=E0=AE=BF=E0=AE=AF=E0=AE=BE=E0=AE=B4=E0=AE=A9=E0=AF=8D =E0=AE=9F= =E0=AE=BF=E0=AE=9A=E0=AE=AE=E0=AF=8D=E0=AE=AA=E0=AE=B0=E0=AF=8D 02, 2021] V= isuwesh wrote: > `recover-this-file' quite helpfully shows the time of creation of the > auto-save file.=C2=A0 However, this is not always enough to decide whethe= r I > should recover from said auto-save file since there's no way of knowing > if the changes in auto-save file are desirable [1] so I end up answering > yes, then run `diff-buffer-with-file' anyway.=C2=A0 I think having a > `diff-buffer-with-file' option like `save-some-buffers' would be a > quality-of-life improvement. Please find attached path that uses read-answer to present the diff. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Offer-to-show-diff-against-auto-save-in-recover-file.patch >From d64f8a1307ab82216b5f97982494945547810f64 Mon Sep 17 00:00:00 2001 From: Visuwesh Date: Wed, 6 Dec 2023 13:45:03 +0530 Subject: [PATCH] Offer to show diff against auto-save in recover-file * lisp/files.el (recover-file): Show diff against the selected auto save file. bug#52242 * etc/NEWS: Announce the new feature. --- etc/NEWS | 4 ++++ lisp/files.el | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/etc/NEWS b/etc/NEWS index 29f4e5c0b66..6c2a584c355 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -258,6 +258,10 @@ called in the '--eval' expression, which is useful when those arguments contain arbitrary characters that otherwise might require elaborate and error-prone escaping (to protect them from the shell). +** 'recover-this-file' can show diff between auto save file and current file. +When answering the prompt with "diff" or "=", it now shows the diff +between the auto save file and the current file. + * Editing Changes in Emacs 30.1 diff --git a/lisp/files.el b/lisp/files.el index 1cdcec23b11..d70524e4775 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -7083,7 +7083,15 @@ recover-file #'(lambda (window _value) (with-selected-window window (unwind-protect - (yes-or-no-p (format "Recover auto save file %s? " file-name)) + (let ((prompt (format "Recover auto save file %s? " file-name)) + (choices + '(("yes" ?y "recover auto save file") + ("no" ?n "don't recover auto save file") + ("diff" ?= "diff auto save file with current file"))) + ans) + (while (equal "diff" (setq ans (read-answer prompt choices))) + (diff file file-name)) + (equal ans "yes")) (when (window-live-p window) (quit-restore-window window 'kill))))) (with-current-buffer standard-output -- 2.42.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 00:32:57 2023 Received: (at 52242) by debbugs.gnu.org; 7 Dec 2023 05:32:58 +0000 Received: from localhost ([127.0.0.1]:40864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rB70L-0000f8-Es for submit@debbugs.gnu.org; Thu, 07 Dec 2023 00:32:57 -0500 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:56747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rB70I-0000et-Aw for 52242@debbugs.gnu.org; Thu, 07 Dec 2023 00:32:55 -0500 Received: by mail-pf1-x441.google.com with SMTP id d2e1a72fcca58-6ce934e9d51so248746b3a.1 for <52242@debbugs.gnu.org>; Wed, 06 Dec 2023 21:32:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701927156; x=1702531956; darn=debbugs.gnu.org; h=mime-version:user-agent:references:message-id:date:in-reply-to :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=6bfyeC0YqoM9P/Io7OGQ93LjXC3WagQFSKpUDqXdCAE=; b=WW1q5uuEiKKemA4GRxMK5CWUVuzg5Hl/JlKffx9FDgWAcLLBrP8Bb9+UINMiZYHs8X Dd3grw2ozNb71dKQb4BkAuV1TaE70HsNcFcd8bhfPvefZy8wocihTb/u6gBGEHOSk8es zOEoZFFb5t3Khhoq+Hys1XXPxwvmZZGW8AtnFf8kouSwpRbNI4C4iEo5o5gpLxLm/8Cx dirovyBep9dScYwpI09jki19/iElyvmNC0vsaXDIAfUgIrr/Ya9lIy+PwxDgv80PV0SU dR4RNTm8Iobno0T2bxHoHzE4rsuPrsLU7qTgRGC2P3ye+JIHHiZdYzcIJ5iSWMWM/0ic +JXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701927156; x=1702531956; h=mime-version:user-agent:references:message-id:date:in-reply-to :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=6bfyeC0YqoM9P/Io7OGQ93LjXC3WagQFSKpUDqXdCAE=; b=GElKs2jj7HxdUCDxd4eISQVUjdM60YN4kFnQJLQ51f0Dyl4yJBTloChQPC95fsDHU6 0ETBOy6JtCle3Q8H9+lx4rsUSRIbSK2V8MyyPzrjGpxu5Q6nax1TTobshJp9HkmmimIa 2epFlerFqU/Fnz4CQ14/Dvd+4Bx8WEiO2aLbFCdPcingMJP59wQYvDLvi7Ct6m9gMt/H /59N1fKOrxFdrs7ssIHZ6b+xApK7CKu76laTbtIEPxucW5qmUlrIRGbq8RnfGSdiUwaw Yfg7hVjl64aeMyXSdRjB8umCOfV9aCBDlthXAIFa0eZBS0HaSqpTqtEySEmIAg+rdnYa rhNg== X-Gm-Message-State: AOJu0Yxl7HUMxrsssTKCMFZ7WqHEsFzQxBrmoYQuEdMa+1G+unITV6/c wBcFcsFBsNsmvPXvaoHRF47gif76kx04Qg== X-Google-Smtp-Source: AGHT+IFoGiSh8e1NP1xdSedAve7Qe8+WyLTyatkEguh/YLFV0q8dMfVV5aTeGeP0COUTuLVMk9XJ9Q== X-Received: by 2002:a05:6a21:a58a:b0:18f:da50:fbd7 with SMTP id gd10-20020a056a21a58a00b0018fda50fbd7mr2261752pzc.33.1701927155600; Wed, 06 Dec 2023 21:32:35 -0800 (PST) Received: from localhost ([115.240.90.130]) by smtp.gmail.com with ESMTPSA id u1-20020a170902e5c100b001d05bb77b43sm397804plf.19.2023.12.06.21.32.34 for <52242@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 21:32:34 -0800 (PST) From: Visuwesh To: 52242@debbugs.gnu.org Subject: Re: bug#52242: 29.0.50; Feature Request: Offer to run`diff-buffer-with-file' in `recover-this-file' prompt In-Reply-To: <8734wfwxi4.fsf@gmail.com> (Visuwesh's message of "Wed, 06 Dec 2023 13:52:59 +0530") Date: Thu, 07 Dec 2023 11:02:28 +0530 Message-ID: <87wmtqvaqb.fsf@gmail.com> References: <8734wfwxi4.fsf@gmail.com> 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: 52242 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; charset=utf-8 Content-Transfer-Encoding: quoted-printable [=E0=AE=AA=E0=AF=81=E0=AE=A4=E0=AE=A9=E0=AF=8D =E0=AE=9F=E0=AE=BF=E0=AE=9A= =E0=AE=AE=E0=AF=8D=E0=AE=AA=E0=AE=B0=E0=AF=8D 06, 2023] Visuwesh wrote: > [=E0=AE=B5=E0=AE=BF=E0=AE=AF=E0=AE=BE=E0=AE=B4=E0=AE=A9=E0=AF=8D =E0=AE= =9F=E0=AE=BF=E0=AE=9A=E0=AE=AE=E0=AF=8D=E0=AE=AA=E0=AE=B0=E0=AF=8D 02, 2021= ] Visuwesh wrote: > >> `recover-this-file' quite helpfully shows the time of creation of the >> auto-save file.=C2=A0 However, this is not always enough to decide wheth= er I >> should recover from said auto-save file since there's no way of knowing >> if the changes in auto-save file are desirable [1] so I end up answering >> yes, then run `diff-buffer-with-file' anyway.=C2=A0 I think having a >> `diff-buffer-with-file' option like `save-some-buffers' would be a >> quality-of-life improvement. > > Please find attached path that uses read-answer to present the diff. I didn't notice that recover-file was covered in the Emacs manual, I have now updated the manual and marked the NEWS entry accordingly in the attached patch. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Offer-to-show-diff-against-auto-save-in-recover-file.patch >From 60d90c030a5b9a86a778df8650a597e922f2a907 Mon Sep 17 00:00:00 2001 From: Visuwesh Date: Wed, 6 Dec 2023 13:45:03 +0530 Subject: [PATCH] Offer to show diff against auto-save in recover-file * lisp/files.el (recover-file): Show diff against the selected auto save file. (Bug#52242) * doc/emacs/files.texi (Recover): Document the new feature. * etc/NEWS: Announce the new feature. --- doc/emacs/files.texi | 8 +++++--- etc/NEWS | 5 +++++ lisp/files.el | 10 +++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 917e937d32d..c791a6f1c98 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1325,9 +1325,11 @@ Recover @end example Before asking for confirmation, @kbd{M-x recover-file} displays a -directory listing describing the specified file and the auto-save file, -so you can compare their sizes and dates. If the auto-save file -is older, @kbd{M-x recover-file} does not offer to read it. +directory listing describing the specified file and the auto-save +file, so you can compare their sizes and dates. If you answer +@kbd{diff}, it shows the diff between @var{file} and its auto-save +file @file{#@var{file}#}. If the auto-save file is older, @kbd{M-x +recover-file} does not offer to read it. @findex recover-session If Emacs or the computer crashes, you can recover all the files you diff --git a/etc/NEWS b/etc/NEWS index 29f4e5c0b66..f69595ef188 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -258,6 +258,11 @@ called in the '--eval' expression, which is useful when those arguments contain arbitrary characters that otherwise might require elaborate and error-prone escaping (to protect them from the shell). ++++ +** 'recover-file' can show diff between auto save file and current file. +When answering the prompt with "diff" or "=", it now shows the diff +between the auto save file and the current file. + * Editing Changes in Emacs 30.1 diff --git a/lisp/files.el b/lisp/files.el index 1cdcec23b11..d70524e4775 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -7083,7 +7083,15 @@ recover-file #'(lambda (window _value) (with-selected-window window (unwind-protect - (yes-or-no-p (format "Recover auto save file %s? " file-name)) + (let ((prompt (format "Recover auto save file %s? " file-name)) + (choices + '(("yes" ?y "recover auto save file") + ("no" ?n "don't recover auto save file") + ("diff" ?= "diff auto save file with current file"))) + ans) + (while (equal "diff" (setq ans (read-answer prompt choices))) + (diff file file-name)) + (equal ans "yes")) (when (window-live-p window) (quit-restore-window window 'kill))))) (with-current-buffer standard-output -- 2.42.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 09 04:33:56 2023 Received: (at 52242) by debbugs.gnu.org; 9 Dec 2023 09:33:56 +0000 Received: from localhost ([127.0.0.1]:46833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBtid-0004LJ-T4 for submit@debbugs.gnu.org; Sat, 09 Dec 2023 04:33:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBtib-0004L2-MQ for 52242@debbugs.gnu.org; Sat, 09 Dec 2023 04:33:54 -0500 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 1rBtiI-0007gs-Rz; Sat, 09 Dec 2023 04:33:34 -0500 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=qjOWV8b1l+7cux3uxXP0SyvHuY/kWA034o6SCPwKTnw=; b=d+jDAGdDkK4i cYSRw+m3mzklvPR3qBJiJ4Do7Yk26H69GzaeFx5xXYW5duONa9Mkcl4KC8AxvJYMghFmQIwojYfml 2BiuhxklphFNzogHSu7jntHi+nR6kJuA9ngsd/SQp23Zw/P5RpWKWiMgK/dJKgHflwOEwfCznOoez n3yCmrpOHtrqAaesu+gxAXmrrjL8bIdNzzaqJq5VHsyvjpi9qHMk8mAUDsvu29ElsOzW73O3fVy3I TKviyUtaIT4ASoWShapAdGiICycV3SJcVCSfXvTb3sh7LfuameMGNfWFkzUIn9tllWOa/4yJC46EA 5FYiiWQq90euUP1LH+2VBQ==; Date: Sat, 09 Dec 2023 11:33:18 +0200 Message-Id: <83h6kryb35.fsf@gnu.org> From: Eli Zaretskii To: Visuwesh In-Reply-To: <87wmtqvaqb.fsf@gmail.com> (message from Visuwesh on Thu, 07 Dec 2023 11:02:28 +0530) Subject: Re: bug#52242: 29.0.50; Feature Request: Offer to run`diff-buffer-with-file' in `recover-this-file' prompt References: <8734wfwxi4.fsf@gmail.com> <87wmtqvaqb.fsf@gmail.com> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 52242 Cc: 52242@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: Visuwesh > Date: Thu, 07 Dec 2023 11:02:28 +0530 > > I didn't notice that recover-file was covered in the Emacs manual, I > have now updated the manual and marked the NEWS entry accordingly in the > attached patch. Thanks, I have a few comments: > diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi > index 917e937d32d..c791a6f1c98 100644 > --- a/doc/emacs/files.texi > +++ b/doc/emacs/files.texi > @@ -1325,9 +1325,11 @@ Recover > @end example > > Before asking for confirmation, @kbd{M-x recover-file} displays a > -directory listing describing the specified file and the auto-save file, > -so you can compare their sizes and dates. If the auto-save file > -is older, @kbd{M-x recover-file} does not offer to read it. > +directory listing describing the specified file and the auto-save > +file, so you can compare their sizes and dates. If you answer > +@kbd{diff}, it shows the diff between @var{file} and its auto-save > +file @file{#@var{file}#}. If the auto-save file is older, @kbd{M-x > +recover-file} does not offer to read it. It is better to make the documentation of the 'diff' response separate from the rest, since the original text doesn't describe the responses at all, it only mentions the need for confirmation. So I suggest to leave the text starting at "Before asking for confirmation" alone, and add a new paragraph after that one, like this: When @kbd{M-x recover-file} asks for confirmation, if you respond with @kbd{diff} or @kbd{=}, it shows the diffs between ... > ++++ > +** 'recover-file' can show diff between auto save file and current file. ^^^^ We use "diffs", plural. > +When answering the prompt with "diff" or "=", it now shows the diff ^^^^ Same here. > +between the auto save file and the current file. > + (choices > + '(("yes" ?y "recover auto save file") > + ("no" ?n "don't recover auto save file") > + ("diff" ?= "diff auto save file with current file"))) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Maybe a better text would be show changes between auto save file and current file > + ans) > + (while (equal "diff" (setq ans (read-answer prompt choices))) > + (diff file file-name)) > + (equal ans "yes")) Thanks. From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 10 08:28:24 2023 Received: (at 52242) by debbugs.gnu.org; 10 Dec 2023 13:28:24 +0000 Received: from localhost ([127.0.0.1]:49777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCJr5-00067U-KF for submit@debbugs.gnu.org; Sun, 10 Dec 2023 08:28:24 -0500 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:60803) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCJr2-00067G-U5 for 52242@debbugs.gnu.org; Sun, 10 Dec 2023 08:28:22 -0500 Received: by mail-pl1-x642.google.com with SMTP id d9443c01a7336-1d0ccda19eeso22502665ad.1 for <52242@debbugs.gnu.org>; Sun, 10 Dec 2023 05:28:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702214881; x=1702819681; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=6ihA1hHwEcuKDOhsLEsTCEwGnU9r0PtfOFPiq86aixU=; b=Y4lIkMi/qSHCU4w/n5lIKzReDWTU9nGcGv61jn/GhZU6om+YCow5H5awoCMe8gzzkh jB/N2foD+0Rx79Toea41nlOwCJGDHSUnFuuYUc/yynD4pNOf4ECM/1zCVLjutXwi8/rg e9SwUcE9glMIPLhcAMcdE//BzAIeVZfIxaMYQimFkp+vDh361geE43A15zZiWEO8tu/5 /52ZLHetxcdk/IjWDjQUHzdqbUtbfteFudk1iPlsgR5E9oleLAN1epUedugA0OECbPlW uScaSEQwiiHyEJ451OTvaF7BnonUCst7RIRrzw1sJmppiKaygQj3nZBgISj1OYc6q8k5 qOag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702214881; x=1702819681; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=6ihA1hHwEcuKDOhsLEsTCEwGnU9r0PtfOFPiq86aixU=; b=QbNIjqYAkhl/4NS//hjBEIgoNakm1NE87ecPFFwG7Tnk/KudIl/93Az/8nDWnuCvWd PfmhCMQZa1WztzCKyZkdUSx20typyIp9/tAy73ks35+QJLbfxpOjdj3VP0x5IE6Q3ld7 WifocMrIGjpJrVa5VX6gbyL6UYYolfFlbJmuzIIh6Fz62fY8PUEkB/SvYTfHq9VDqYK/ PJeGCgRaKzA5FK6odvf047pml8BmrOO1cf09FljhnaXUUbsNVAa32AuNxPNdofmeXwxz 9zjlcG+UuS8liX39jtttlGhgqSLS7rRHh9gOGv4mQBJu7PcSxrqZBxCzAW1zHgYtLG8v FhlA== X-Gm-Message-State: AOJu0Yy4IGuxSGVdueDk5arBf/N5rJeOCvesgrGtH9ty7nfXrL7zdzvU xCqBNKwnS5aQLBWMNnTaPvc= X-Google-Smtp-Source: AGHT+IGGSmJSrpDyNnF2k3sR3xPzCocy0EPAUIh3lDmeFMBF9l5JbWt5VitiCH0r4rKhinB+s4lmBQ== X-Received: by 2002:a17:902:e54a:b0:1d0:6ffe:1e8b with SMTP id n10-20020a170902e54a00b001d06ffe1e8bmr1519310plf.110.1702214880661; Sun, 10 Dec 2023 05:28:00 -0800 (PST) Received: from localhost ([49.205.87.230]) by smtp.gmail.com with ESMTPSA id iz17-20020a170902ef9100b001cfc170c0cfsm4786601plb.119.2023.12.10.05.27.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 05:27:59 -0800 (PST) From: Visuwesh To: Eli Zaretskii Subject: Re: bug#52242: 29.0.50; Feature Request: Offer to run`diff-buffer-with-file' in `recover-this-file' prompt In-Reply-To: <83h6kryb35.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 09 Dec 2023 11:33:18 +0200") References: <8734wfwxi4.fsf@gmail.com> <87wmtqvaqb.fsf@gmail.com> <83h6kryb35.fsf@gnu.org> Date: Sun, 10 Dec 2023 18:57:56 +0530 Message-ID: <87o7eyuqzn.fsf@gmail.com> 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: 52242 Cc: 52242@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; charset=utf-8 Content-Transfer-Encoding: quoted-printable [=E0=AE=9A=E0=AE=A9=E0=AE=BF =E0=AE=9F=E0=AE=BF=E0=AE=9A=E0=AE=AE=E0=AF=8D= =E0=AE=AA=E0=AE=B0=E0=AF=8D 09, 2023] Eli Zaretskii wrote: >> From: Visuwesh >> Date: Thu, 07 Dec 2023 11:02:28 +0530 >>=20 >> I didn't notice that recover-file was covered in the Emacs manual, I >> have now updated the manual and marked the NEWS entry accordingly in the >> attached patch. > > Thanks, I have a few comments: Thanks for the review. >> diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi >> index 917e937d32d..c791a6f1c98 100644 >> --- a/doc/emacs/files.texi >> +++ b/doc/emacs/files.texi >> @@ -1325,9 +1325,11 @@ Recover >> @end example >>=20=20 >> Before asking for confirmation, @kbd{M-x recover-file} displays a >> -directory listing describing the specified file and the auto-save file, >> -so you can compare their sizes and dates. If the auto-save file >> -is older, @kbd{M-x recover-file} does not offer to read it. >> +directory listing describing the specified file and the auto-save >> +file, so you can compare their sizes and dates. If you answer >> +@kbd{diff}, it shows the diff between @var{file} and its auto-save >> +file @file{#@var{file}#}. If the auto-save file is older, @kbd{M-x >> +recover-file} does not offer to read it. > > It is better to make the documentation of the 'diff' response separate > from the rest, since the original text doesn't describe the responses > at all, it only mentions the need for confirmation. > > So I suggest to leave the text starting at "Before asking for > confirmation" alone, and add a new paragraph after that one, like > this: > > When @kbd{M-x recover-file} asks for confirmation, if you respond > with @kbd{diff} or @kbd{=3D}, it shows the diffs between ... OK, I made it into a separate paragraph and added that it reprompts for confirmation. >> ++++ >> +** 'recover-file' can show diff between auto save file and current file. > ^^^^ > We use "diffs", plural. > >> +When answering the prompt with "diff" or "=3D", it now shows the diff > ^^^^ > Same here. Done. >> +between the auto save file and the current file. >> + (choices >> + '(("yes" ?y "recover auto save file") >> + ("no" ?n "don't recover auto save file") >> + ("diff" ?=3D "diff auto save file with c= urrent file"))) > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^= ^^^^^^^^^^^ > Maybe a better text would be > > show changes between auto save file and current file Thank you, that is indeed clear. I have now changed the help text to your suggestion. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Offer-to-show-diff-against-auto-save-in-recover-file.patch >From 49105b0b98c6cccfda028f2ed52fe3cbd403028b Mon Sep 17 00:00:00 2001 From: Visuwesh Date: Wed, 6 Dec 2023 13:45:03 +0530 Subject: [PATCH] Offer to show diff against auto-save in recover-file * lisp/files.el (recover-file): Show diff against the selected auto save file. (Bug#52242) * doc/emacs/files.texi (Recover): Document the new feature. * etc/NEWS: Announce the new feature. --- doc/emacs/files.texi | 8 ++++++-- etc/NEWS | 5 +++++ lisp/files.el | 10 +++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 917e937d32d..2fc1550de61 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1325,10 +1325,14 @@ Recover @end example Before asking for confirmation, @kbd{M-x recover-file} displays a -directory listing describing the specified file and the auto-save file, -so you can compare their sizes and dates. If the auto-save file +directory listing describing the specified file and the auto-save +file, so you can compare their sizes and dates. If the auto-save file is older, @kbd{M-x recover-file} does not offer to read it. +When @kbd{M-x recover-file} asks for confirmation, if you answer with +@kbd{diff} or @kbd{=}, it shows the diffs between @var{file} and its +auto-save file @file{#@var{file}#} and reprompts you for confirmation. + @findex recover-session If Emacs or the computer crashes, you can recover all the files you were editing from their auto save files with the command @kbd{M-x diff --git a/etc/NEWS b/etc/NEWS index 29f4e5c0b66..39708d866d3 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -258,6 +258,11 @@ called in the '--eval' expression, which is useful when those arguments contain arbitrary characters that otherwise might require elaborate and error-prone escaping (to protect them from the shell). ++++ +** 'recover-file' can show diffs between auto save file and current file. +When answering the prompt with "diff" or "=", it now shows the diffs +between the auto save file and the current file. + * Editing Changes in Emacs 30.1 diff --git a/lisp/files.el b/lisp/files.el index 1cdcec23b11..83534e0080c 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -7083,7 +7083,15 @@ recover-file #'(lambda (window _value) (with-selected-window window (unwind-protect - (yes-or-no-p (format "Recover auto save file %s? " file-name)) + (let ((prompt (format "Recover auto save file %s? " file-name)) + (choices + '(("yes" ?y "recover auto save file") + ("no" ?n "don't recover auto save file") + ("diff" ?= "show changes between auto save file and current file"))) + ans) + (while (equal "diff" (setq ans (read-answer prompt choices))) + (diff file file-name)) + (equal ans "yes")) (when (window-live-p window) (quit-restore-window window 'kill))))) (with-current-buffer standard-output -- 2.42.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 10 23:15:19 2023 Received: (at 52242) by debbugs.gnu.org; 11 Dec 2023 04:15:19 +0000 Received: from localhost ([127.0.0.1]:52225 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCXhO-0000li-NO for submit@debbugs.gnu.org; Sun, 10 Dec 2023 23:15:19 -0500 Received: from mail-yw1-x1142.google.com ([2607:f8b0:4864:20::1142]:56764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCXhL-0000lL-4X for 52242@debbugs.gnu.org; Sun, 10 Dec 2023 23:15:17 -0500 Received: by mail-yw1-x1142.google.com with SMTP id 00721157ae682-5d747dbf81eso33049447b3.1 for <52242@debbugs.gnu.org>; Sun, 10 Dec 2023 20:15:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702268095; x=1702872895; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=ECY4q++xeBdedASGMA7W2HNEI7nlW65jENMWKfCog24=; b=KHQEB0VYW5riNvILeOvrODiBzysKwH90QUToegOGlxxyHru1w4n1CslYIYxD0k7jcR Ps/b2JNURXCbgeYP3N3BhSwh5p6OLlxhuoE4dxwMJfqowQCyhwmbt7IJkAMB0X4qFNPj 8t+/9KRHARVwsiBnlH8zGaMQvdbcyen0mr69SHdwhJSUfaS87MIOWs8v1RTm044Yx5Dd njmmHJJZN7FBuMUL2cvFWrqdHmb0ueu9xMnWGYhOvNaYWQXX/WxPeRUFvq5ksqAt3MK4 6ekqwcKQDdIsuIWr8uxU3DliBZQJjmBf/fF3qn1JPSoks20G6de4nuZNyrU2gq0sFHFu 8NPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702268095; x=1702872895; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ECY4q++xeBdedASGMA7W2HNEI7nlW65jENMWKfCog24=; b=ZYTJSMMioxiA1HkqXwsgwyMHOEDOkXBs1kqhOZ2d+NAI1X0zLQhgXEu1ivgaHWttOD dR8ZfVNuilDwTqu1M7scQHm1FCapvsFDGDwC5HKyfIXD6CQgA2DesXBNDonEoGbCUbEV mzj55OCnJpUD7QK8vPQb/66LNfjmGSLTWKXyPljACienTb949ZaBHmQjoHTN265xddID KViEV4N4LDrwqWy2AV1vvbBEISJfyqUYRsquK3uuqkqCNvA1ql8Hkjm7FZB+MUNP5mQN ZSkLQPm+t6AtUUpv1wvTBXyN77vq3C/gYvUIPbQcfdwOQuQtt5MMT4H0xGibPnal3hPq 1D9A== X-Gm-Message-State: AOJu0YxTClhMqH5qWUAluplXHSAfgClbBUROey9ytehzEyjBkqMWB1LZ Rr1jH8m2nqgs3qyvTVDFTjcshSVKY2BPng== X-Google-Smtp-Source: AGHT+IGflTWmCSyNc72/+kdhy7+D3XYSKsBuLg2yNE52XGXxUomlALI0Ix759RLAPmBTPXzmNPlb6w== X-Received: by 2002:a81:77c6:0:b0:5d7:1941:a9a with SMTP id s189-20020a8177c6000000b005d719410a9amr2842102ywc.53.1702268094579; Sun, 10 Dec 2023 20:14:54 -0800 (PST) Received: from localhost ([49.205.83.111]) by smtp.gmail.com with ESMTPSA id g13-20020a170902d5cd00b001d1d6f6b67dsm5505334plh.147.2023.12.10.20.14.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 20:14:53 -0800 (PST) From: Visuwesh To: Eli Zaretskii Subject: Re: bug#52242: 29.0.50; Feature Request: Offer to run`diff-buffer-with-file' in `recover-this-file' prompt In-Reply-To: <87o7eyuqzn.fsf@gmail.com> (Visuwesh's message of "Sun, 10 Dec 2023 18:57:56 +0530") References: <8734wfwxi4.fsf@gmail.com> <87wmtqvaqb.fsf@gmail.com> <83h6kryb35.fsf@gnu.org> <87o7eyuqzn.fsf@gmail.com> Date: Mon, 11 Dec 2023 09:44:50 +0530 Message-ID: <87jzplv0hx.fsf@gmail.com> 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: 52242 Cc: 52242@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; charset=utf-8 Content-Transfer-Encoding: base64 W+CunuCuvuCur+Cuv+CuseCvgSDgrp/grr/grprgrq7gr43grqrgrrDgr40gMTAsIDIwMjNdIFZp c3V3ZXNoIHdyb3RlOg0KDQpKdXN0IG5vdGljZWQgdGhhdCBJIGhhZCBhbiB1bnJlbGF0ZWQgZmls bGluZyBjaGFuZ2Ugc25lYWsgaW4sIHRoZQ0KYXR0YWNoZWQgcGF0Y2ggb21pdHMgdGhhdC4gIFNv cnJ5IGZvciB0aGUgbm9pc2UuDQoNCg== --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Offer-to-show-diff-against-auto-save-in-recover-file.patch >From d4ce87ae26c3c43851841432d4f3e1b3f5404f75 Mon Sep 17 00:00:00 2001 From: Visuwesh Date: Wed, 6 Dec 2023 13:45:03 +0530 Subject: [PATCH] Offer to show diff against auto-save in recover-file * lisp/files.el (recover-file): Show diff against the selected auto save file. (Bug#52242) * doc/emacs/files.texi (Recover): Document the new feature. * etc/NEWS: Announce the new feature. --- doc/emacs/files.texi | 4 ++++ etc/NEWS | 5 +++++ lisp/files.el | 10 +++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 917e937d32d..832c189ce49 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1329,6 +1329,10 @@ Recover so you can compare their sizes and dates. If the auto-save file is older, @kbd{M-x recover-file} does not offer to read it. +When @kbd{M-x recover-file} asks for confirmation, if you answer with +@kbd{diff} or @kbd{=}, it shows the diffs between @var{file} and its +auto-save file @file{#@var{file}#} and reprompts you for confirmation. + @findex recover-session If Emacs or the computer crashes, you can recover all the files you were editing from their auto save files with the command @kbd{M-x diff --git a/etc/NEWS b/etc/NEWS index 29f4e5c0b66..39708d866d3 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -258,6 +258,11 @@ called in the '--eval' expression, which is useful when those arguments contain arbitrary characters that otherwise might require elaborate and error-prone escaping (to protect them from the shell). ++++ +** 'recover-file' can show diffs between auto save file and current file. +When answering the prompt with "diff" or "=", it now shows the diffs +between the auto save file and the current file. + * Editing Changes in Emacs 30.1 diff --git a/lisp/files.el b/lisp/files.el index 1cdcec23b11..83534e0080c 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -7083,7 +7083,15 @@ recover-file #'(lambda (window _value) (with-selected-window window (unwind-protect - (yes-or-no-p (format "Recover auto save file %s? " file-name)) + (let ((prompt (format "Recover auto save file %s? " file-name)) + (choices + '(("yes" ?y "recover auto save file") + ("no" ?n "don't recover auto save file") + ("diff" ?= "show changes between auto save file and current file"))) + ans) + (while (equal "diff" (setq ans (read-answer prompt choices))) + (diff file file-name)) + (equal ans "yes")) (when (window-live-p window) (quit-restore-window window 'kill))))) (with-current-buffer standard-output -- 2.42.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 16 07:37:12 2023 Received: (at 52242-done) by debbugs.gnu.org; 16 Dec 2023 12:37:12 +0000 Received: from localhost ([127.0.0.1]:54137 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rETuo-00048w-Pe for submit@debbugs.gnu.org; Sat, 16 Dec 2023 07:37:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rETub-00048A-Ul for 52242-done@debbugs.gnu.org; Sat, 16 Dec 2023 07:37:10 -0500 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 1rETuW-0005eb-27; Sat, 16 Dec 2023 07:36:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=YppRWxKq17prF53HKmIeTcnMfNEyuLOni6aOxAa5n98=; b=YcvH3JB2hxVrvQjeS4an IlSiyI0k/gS3xeA+3CDt1YCsVNUVyng/zOhLJqXlp0cKgdhyrNNkkrioyQMVnjzAUW5TN+07rKugb i5/o2Kh9RE1S+6EUDnYg4WZqCT0iot91+BTiPQQMjFSvycCpiD9oJ3ygyd22xOVNSmA0ZQOCm9lXx dgWHF2BzfUJiCVSTAZqzF/NJ4EqewD6ib0epSRXlH/sADtvcwwDIqKAroLRHlFnQxSCc/2936FfgT 2MsOhckOFaxfgqfsR2q2CXFWCRDbCIbVJQ0h5a0HW85NaiD2TvZgIxmvgBwBjOdoMeV0N7N8edFQV LHd8VzXXjMIcRw==; Date: Sat, 16 Dec 2023 14:36:33 +0200 Message-Id: <83o7eqmii6.fsf@gnu.org> From: Eli Zaretskii To: Visuwesh In-Reply-To: <87jzplv0hx.fsf@gmail.com> (message from Visuwesh on Mon, 11 Dec 2023 09:44:50 +0530) Subject: Re: bug#52242: 29.0.50; Feature Request: Offer to run`diff-buffer-with-file' in `recover-this-file' prompt References: <8734wfwxi4.fsf@gmail.com> <87wmtqvaqb.fsf@gmail.com> <83h6kryb35.fsf@gnu.org> <87o7eyuqzn.fsf@gmail.com> <87jzplv0hx.fsf@gmail.com> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52242-done Cc: 52242-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: Visuwesh > Cc: 52242@debbugs.gnu.org > Date: Mon, 11 Dec 2023 09:44:50 +0530 > > [ஞாயிறு டிசம்பர் 10, 2023] Visuwesh wrote: > > Just noticed that I had an unrelated filling change sneak in, the > attached patch omits that. Sorry for the noise. Thanks, installed on the master branch, and closing the bug. From unknown Wed Jun 18 23:14:41 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 14 Jan 2024 12:24:05 +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