Commit 4a508479 authored by Chong Yidong's avatar Chong Yidong
Browse files

(message-pop-to-buffer): Add switch-function argument.

(message-mail): Pass switch-function argument to it.
parent c14dcd06
......@@ -5578,7 +5578,7 @@ between beginning of field and beginning of line."
(defun message-pop-to-buffer (name)
(defun message-pop-to-buffer (name &optional switch-function)
"Pop to buffer NAME, and warn if it already exists and is modified."
(let ((buffer (get-buffer name)))
(if (and buffer
......@@ -5589,14 +5589,16 @@ between beginning of field and beginning of line."
(gnus-select-frame-set-input-focus (window-frame window))
(select-window window))
(set-buffer (pop-to-buffer buffer)))
(funcall (or switch-function 'pop-to-buffer) buffer)
(set-buffer buffer))
(when (and (buffer-modified-p)
(not (prog1
"Message already being composed; erase? ")
(message nil))))
(error "Message being composed")))
(set-buffer (pop-to-buffer name)))
(funcall (or switch-function 'pop-to-buffer) name)
(set-buffer name))
......@@ -5833,15 +5835,15 @@ is a function used to switch to and display the mail buffer."
(let ((message-this-is-mail t) replybuffer)
(unless (message-mail-user-agent)
(or switch-function 'message-pop-to-buffer)
;; Search for the existing message buffer if `continue' is non-nil.
(let ((message-generate-new-buffers
(when (or (not continue)
(eq message-generate-new-buffers 'standard)
(functionp message-generate-new-buffers))
(message-buffer-name "mail" to))))
(message-buffer-name "mail" to))
;; FIXME: message-mail should do something if YANK-ACTION is not
;; insert-buffer.
(and (consp yank-action) (eq (car yank-action) 'insert-buffer)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment