procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix returning to original TTY frame after 'rmail-reply'

Browse source 
* lisp/mail/rmail.el (rmail-start-mail): Record the frame from
which an Rmail command, such as 'rmail-mail' or 'rmail-reply', was
invoked.
(rmail--find-orig-rmail-frame): New function.
(rmail-mail-return): Use 'rmail--find-orig-rmail-frame' to find
the original frame, and make it the top frame on its TTY terminal.
(Bug#69738)
This commit is contained in:
Eli Zaretskii 2024-07-06 10:32:39 +03:00
parent 814710067f
commit 1b5cf29431
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lisp/mail/rmail.el
View file

@ -3686,7 +3686,12 @@ If BUFFER is not swapped, yank out of its message viewer buffer."
other-headers) other-headers)
(let ((switch-function (let ((switch-function
(cond (same-window nil) (cond (same-window nil)
(rmail-mail-new-frame 'switch-to-buffer-other-frame) (rmail-mail-new-frame
(progn
;; Record the frame from which we invoked this command.
(modify-frame-parameters (selected-frame)
'((rmail-orig-frame . t)))
'switch-to-buffer-other-frame))
(t 'switch-to-buffer-other-window))) (t 'switch-to-buffer-other-window)))
yank-action) yank-action)
(if replybuffer (if replybuffer
@ -3716,6 +3721,11 @@ If BUFFER is not swapped, yank out of its message viewer buffer."
(modify-frame-parameters (selected-frame) (modify-frame-parameters (selected-frame)
'((mail-dedicated-frame . t))))))) '((mail-dedicated-frame . t)))))))
(defun rmail--find-orig-rmail-frame ()
(car (filtered-frame-list
(lambda (frame)
(eq (frame-parameter frame 'rmail-orig-frame) t)))))
(defun rmail-mail-return (&optional newbuf) (defun rmail-mail-return (&optional newbuf)
"Try to return to Rmail from the mail window. "Try to return to Rmail from the mail window.
If optional argument NEWBUF is specified, it is the Rmail buffer If optional argument NEWBUF is specified, it is the Rmail buffer
@ -3757,9 +3767,19 @@ to switch to."
;; probably wants to delete it now. ;; probably wants to delete it now.
((display-multi-frame-p) ((display-multi-frame-p)
(delete-frame)) (delete-frame))
;; The previous frame is where normally they have the Rmail buffer (t
;; displayed. ;; Try to find the original Rmail frame and make it the top frame.
(t (other-frame -1)))) (let ((fr (selected-frame))
(orig-fr (rmail--find-orig-rmail-frame)))
(if orig-fr
(progn
(modify-frame-parameters orig-fr '((rmail-orig-frame . nil)))
(select-frame-set-input-focus orig-fr))
;; If we cannot find the frame from which we started, punt, and
;; display the previous frame, which is where they normally have
;; the Rmail buffer displayed.
(other-frame -1))
(delete-frame fr)))))
(defun rmail-mail () (defun rmail-mail ()
"Send mail in another window. "Send mail in another window.