From: Gregory Heytings <gregory@heytings.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: michael_heerdegen@web.de, 51883@debbugs.gnu.org,
Juri Linkov <juri@linkov.net>
Subject: bug#51883: 29.0.50; Command to get accidentally deleted frames back
Date: Wed, 17 Nov 2021 10:02:25 +0000 [thread overview]
Message-ID: <6e65755265ebbce821d3@heytings.org> (raw)
In-Reply-To: <a8022ede870c59258c0f@heytings.org>
[-- Attachment #1: Type: text/plain, Size: 240 bytes --]
>
> And I solved the problem of the deletion of the terminal frame.
>
That solution wasn't robust enough, it would have failed if someone for
some reason did a (setq after-init-time nil). So I implemented something
that shouldn't fail.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-diff; name=Undelete-deleted-frames.patch, Size: 7684 bytes --]
From 2fc329b63b64f2e53c3040c8f5cfd0b1f4667e07 Mon Sep 17 00:00:00 2001
From: Gregory Heytings <gregory@heytings.org>
Date: Wed, 17 Nov 2021 10:01:15 +0000
Subject: [PATCH] Undelete deleted frames.
* lisp/frame.el (undelete-frame): New command.
(undelete-frame--handle-delete-frame): New auxiliary function.
(undelete-frame--deleted-frames, undelete-frame--enabled): New
auxiliary variables.
(undelete-frame-mode): New minor mode.
(ctl-x-5-map): Bind the new command.
* src/frame.c (Fdelete_frame): Update docstring.
* lisp/menu-bar.el (menu-bar-file-menu): Add an entry for the
new command.
* doc/emacs/frames.tex (Frame Commands): Document the new command
and minor mode.
* etc/NEWS: Document the new command and minor mode.
See bug#51883.
---
doc/emacs/frames.texi | 10 +++++++
etc/NEWS | 11 +++++++
lisp/frame.el | 68 +++++++++++++++++++++++++++++++++++++++++++
| 5 ++++
src/frame.c | 3 ++
5 files changed, 97 insertions(+)
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index c14ada2957..296b66aa56 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -512,6 +512,16 @@ Frame Commands
Delete the selected frame (@code{delete-frame}). This signals an
error if there is only one frame.
+@item C-x 5 u
+@kindex C-x 5 u
+@findex undelete-frame
+@findex undelete-frame-mode
+Unless @code{undelete-frame-mode} is disabled, undelete one of the 16
+most recently deleted frames. Without a prefix argument, the most
+recently deleted frame is undeleted. With a numerical prefix argument
+between 0 and 15, where 0 is the most recently deleted frame, the
+corresponding deleted frame is undeleted.
+
@item C-z
@kindex C-z @r{(X windows)}
Minimize (or iconify) the selected Emacs frame
diff --git a/etc/NEWS b/etc/NEWS
index 312fc18f4f..0217f1fe60 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -130,6 +130,17 @@ For example, a 'display-buffer-alist' entry of
will make the body of the chosen window 40 columns wide. For the
height use 'window-height' in combination with 'body-lines'.
+---
+** Frames
+
++++
+*** Deleted frames can now be undeleted.
+The 16 most recently deleted frames can be undeleted with C-x 5 u,
+unless undelete-frame-mode is disabled. Without a prefix argument,
+undelete the most recently deleted frame. A numerical prefix argument
+between 0 and 15 undeletes the corresponding deleted frame, where 0 is
+the most recently deleted frame.
+
** Better detection of text suspiciously reordered on display.
The function 'bidi-find-overridden-directionality' has been extended
to detect reordering effects produced by embeddings and isolates
diff --git a/lisp/frame.el b/lisp/frame.el
index 2c73737a54..1601ed1c44 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2484,6 +2484,73 @@ delete-other-frames
(if iconify (iconify-frame this) (delete-frame this)))
(setq this next))))
+(eval-when-compile (require 'frameset))
+
+(defvar undelete-frame--deleted-frames nil
+ "Internal variable used by `undelete-frame--handle-delete-frame'.")
+
+(defvar undelete-frame--enabled nil
+ "Internal variable used by `undelete-frame--handle-delete-frame'.")
+
+(defun undelete-frame--handle-delete-frame (frame)
+ "Save the configuration of frames deleted with `delete-frame'.
+Only the 16 most recently deleted frames are saved."
+ (when (and (or undelete-frame--enabled
+ (and (not (display-graphic-p))
+ (seq-every-p
+ (lambda (f) (not (frame-parameter f 'display)))
+ (frame-list))))
+ (frame-live-p frame))
+ (setq undelete-frame--deleted-frames
+ (cons (cons
+ (display-graphic-p)
+ (frameset-save (list frame)))
+ undelete-frame--deleted-frames))
+ (if (> (length undelete-frame--deleted-frames) 16)
+ (setq undelete-frame--deleted-frames
+ (butlast undelete-frame--deleted-frames))))
+ (setq undelete-frame--enabled t))
+
+(define-minor-mode undelete-frame-mode
+ "Enable the `delete-frame' command."
+ :group 'frames
+ :global t
+ :initialize 'custom-initialize-delay
+ :init-value t
+ (if undelete-frame-mode
+ (add-hook 'delete-frame-functions
+ #'undelete-frame--handle-delete-frame)
+ (remove-hook 'delete-frame-functions
+ #'undelete-frame--handle-delete-frame)
+ (setq undelete-frame--deleted-frames nil)))
+
+(defun undelete-frame (&optional arg)
+ "Undelete a frame deleted with `delete-frame'.
+Without a prefix argument, or with a non-numerical prefix argument,
+undelete the most recently deleted frame.
+With a numerical prefix argument ARG between 0 and 15, where 0 is
+most recently deleted frame, undelete the ARGth deleted frame.
+When called from Lisp, returns the new frame."
+ (interactive "P")
+ (if (not undelete-frame-mode)
+ (message "undelete-frame-mode is disabled")
+ (let* ((frames (frame-list))
+ (n (if (listp arg) 0 arg))
+ (frameset (nth n undelete-frame--deleted-frames)))
+ (if (not frameset)
+ (message "No deleted frame saved at position %d" n)
+ (if (not (eq (display-graphic-p) (car frameset)))
+ (message
+ "Cannot undelete %sgraphic display frame on a %sgraphic display"
+ (if (display-graphic-p) "non-" "")
+ (if (display-graphic-p) "" "non-"))
+ (setq undelete-frame--deleted-frames
+ (delq frameset undelete-frame--deleted-frames))
+ (frameset-restore (cdr frameset))
+ (let ((frame (car (seq-difference (frame-list) frames))))
+ (when frame
+ (select-frame-set-input-focus frame)
+ frame)))))))
\f
;;; Window dividers.
(defgroup window-divider nil
@@ -2828,6 +2895,7 @@ ctl-x-5-map
(define-key ctl-x-5-map "o" #'other-frame)
(define-key ctl-x-5-map "5" #'other-frame-prefix)
(define-key ctl-x-5-map "c" #'clone-frame)
+(define-key ctl-x-5-map "u" #'undelete-frame)
(define-key global-map [f11] #'toggle-frame-fullscreen)
(define-key global-map [(meta f10)] #'toggle-frame-maximized)
(define-key esc-map [f10] #'toggle-frame-maximized)
--git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 1a81f1a3d0..a5f7169355 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -109,6 +109,11 @@ menu-bar-file-menu
(bindings--define-key menu [separator-tab]
menu-bar-separator))
+ (bindings--define-key menu [undelete-last-deleted-frame]
+ '(menu-item "Undelete Frame" undelete-frame
+ :enable undelete-frame-mode
+ :help "Undelete last deleted frame"))
+
;; Don't use delete-frame as event name because that is a special
;; event.
(bindings--define-key menu [delete-this-frame]
diff --git a/src/frame.c b/src/frame.c
index 79a7c89e0d..9e11bc93ed 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2376,6 +2376,9 @@ DEFUN ("delete-frame", Fdelete_frame, Sdelete_frame, 0, 2, "",
doc: /* Delete FRAME, permanently eliminating it from use.
FRAME must be a live frame and defaults to the selected one.
+The 16 most recently deleted frames can however be undeleted with
+`undelete-frame', which see.
+
A frame may not be deleted if its minibuffer serves as surrogate
minibuffer for another frame. Normally, you may not delete a frame if
all other frames are invisible, but if the second optional argument
--
2.33.0
next prev parent reply other threads:[~2021-11-17 10:02 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 23:38 bug#51883: 29.0.50; Command to get accidentally deleted frames back Michael Heerdegen
2021-11-16 7:53 ` Juri Linkov
2021-11-16 8:14 ` Lars Ingebrigtsen
2021-11-16 20:46 ` Juri Linkov
2021-11-16 8:49 ` Visuwesh via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-11-16 20:20 ` Juri Linkov
2021-11-16 15:17 ` Gregory Heytings
2021-11-16 17:05 ` Gregory Heytings
2021-11-16 17:40 ` Eli Zaretskii
2021-11-16 21:29 ` Gregory Heytings
2021-11-17 10:02 ` Gregory Heytings [this message]
2021-11-17 13:11 ` Eli Zaretskii
2021-11-17 17:06 ` Juri Linkov
2021-11-17 17:14 ` Eli Zaretskii
2021-11-19 9:00 ` Gregory Heytings
2021-11-19 12:17 ` Eli Zaretskii
2021-11-24 0:44 ` Gregory Heytings
2021-11-27 11:36 ` Michael Heerdegen
2021-11-27 11:53 ` Gregory Heytings
2021-11-27 12:05 ` Eli Zaretskii
2021-11-27 12:12 ` Gregory Heytings
2021-11-27 12:30 ` Andreas Schwab
2021-11-27 12:34 ` Eli Zaretskii
2021-11-27 12:23 ` Michael Heerdegen
2021-11-27 12:40 ` Eli Zaretskii
2021-11-27 13:22 ` Michael Heerdegen
2021-11-27 13:26 ` Eli Zaretskii
2021-11-27 13:34 ` Michael Heerdegen
2021-11-27 13:56 ` Eli Zaretskii
2021-11-27 13:59 ` Michael Heerdegen
2021-11-27 14:02 ` Eli Zaretskii
2021-11-27 14:08 ` Michael Heerdegen
2021-11-27 14:47 ` Eli Zaretskii
2021-11-27 14:12 ` Gregory Heytings
2021-11-27 14:24 ` Michael Heerdegen
2021-11-27 14:26 ` Gregory Heytings
2021-11-27 14:33 ` Michael Heerdegen
2021-11-27 14:42 ` Gregory Heytings
2021-11-27 14:54 ` Michael Heerdegen
2021-11-27 17:19 ` Gregory Heytings
2021-11-28 15:47 ` Michael Heerdegen
2021-11-29 13:38 ` Gregory Heytings
2021-11-29 18:18 ` Michael Heerdegen
2021-11-29 19:07 ` Michael Heerdegen
2021-11-29 20:19 ` Juri Linkov
2022-01-13 8:32 ` Juri Linkov
2022-01-14 8:12 ` Juri Linkov
2022-01-16 20:59 ` Juri Linkov
2022-01-17 0:08 ` Michael Heerdegen
2022-01-17 8:24 ` Juri Linkov
2022-01-17 13:00 ` Eli Zaretskii
2022-01-17 18:41 ` Juri Linkov
2022-01-17 18:51 ` Eli Zaretskii
2022-01-18 18:30 ` Juri Linkov
2022-01-19 18:37 ` Juri Linkov
2022-01-19 20:17 ` Eli Zaretskii
2021-12-12 2:44 ` Michael Heerdegen
2022-01-10 8:13 ` Michael Heerdegen
2021-11-27 14:48 ` Eli Zaretskii
2021-11-27 12:13 ` Michael Heerdegen
2022-01-22 18:10 ` Juri Linkov
2022-01-21 17:52 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-01-22 18:08 ` Juri Linkov
2022-01-22 21:26 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-01-23 9:11 ` Juri Linkov
2022-01-23 16:01 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-01-23 18:12 ` Juri Linkov
2022-01-23 21:26 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-01-24 18:12 ` Juri Linkov
2022-01-24 18:32 ` Eli Zaretskii
2022-01-25 9:28 ` martin rudalics
2022-01-25 12:29 ` Eli Zaretskii
2022-01-25 15:58 ` martin rudalics
2022-01-27 17:21 ` Juri Linkov
2022-01-27 17:27 ` Eli Zaretskii
2022-01-27 17:48 ` Juri Linkov
2022-01-24 23:00 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-01-27 17:19 ` Juri Linkov
2022-01-30 16:39 ` Juri Linkov
2022-01-30 16:59 ` Eli Zaretskii
2022-01-30 17:17 ` Juri Linkov
2022-01-30 18:17 ` Eli Zaretskii
2022-01-30 20:49 ` Juri Linkov
2021-11-16 20:30 ` Juri Linkov
2021-11-17 4:13 ` Richard Stallman
2021-11-17 10:07 ` Gregory Heytings
2021-11-17 16:39 ` bug#51883: [External] : " Drew Adams
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6e65755265ebbce821d3@heytings.org \
--to=gregory@heytings.org \
--cc=51883@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=juri@linkov.net \
--cc=michael_heerdegen@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).