(mail-bury): Delete the frame

if this frame looks like it was made for this message.

2 files changed, 16 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc9f5b5dea7..8240349570a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
 2007-09-23  Richard Stallman  <rms@gnu.org>
 
+        * mail/sendmail.el (mail-bury): Delete the frame
+        if this frame looks like it was made for this message.
+
+        * completion.el (completion-separator-self-insert-command)
+        (completion-separator-self-insert-autofilling):
+        If `self-insert-command' has been remapped, use the substitute.
+
+        * simple.el (copy-region-as-kill): Doc fix.
+
         * textmodes/org.el (org-confirm-shell-link-function)
         (org-confirm-elisp-link-function): Doc fixes.
 
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 5803661bc6e..2a986a33f72 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -767,7 +767,13 @@ Prefix arg means don't delete this window."
   "Bury this mail buffer."
   (let ((newbuf (other-buffer (current-buffer))))
     (bury-buffer (current-buffer))
-    (if (and (or (window-dedicated-p (frame-selected-window))
+    (if (and (or nil
+                 ;; In this case, we need to go to a different frame.
+                 (window-dedicated-p (frame-selected-window))
+                 ;; In this mode of operation, the frame was probably
+                 ;; made for this buffer, so the user probably wants
+                 ;; to delete it now.
+                 (and pop-up-frames (one-window-p))
                  (cdr (assq 'mail-dedicated-frame (frame-parameters))))
              (not (null (delq (selected-frame) (visible-frame-list)))))
         (progn