Mercurial > emacs
comparison lisp/mail/sendmail.el @ 65482:b7611654bd5e
2005-09-13 Chong Yidong <cyd@stupidchicken.com>
* mail/sendmail.el (mail): Use new buffer if `noerase' is `new'.
Fix behavior if noerase is `t' and there is no mail buffer.
* simple.el (sendmail-user-agent-compose): Use a new mail buffer
if `continue' is nil, rather than signal an error.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 12 Sep 2005 22:58:55 +0000 |
| parents | 2cbd801671c4 |
| children | 5aebfc4d20d5 fa0da9b57058 |
comparison
equal
deleted
inserted
replaced
| 65481:59060d7bf36c | 65482:b7611654bd5e |
|---|---|
| 1655 ;;; (message "Auto save file for draft message exists; consider M-x mail-recover")) | 1655 ;;; (message "Auto save file for draft message exists; consider M-x mail-recover")) |
| 1656 ;;; t)) | 1656 ;;; t)) |
| 1657 | 1657 |
| 1658 (if (eq noerase 'new) | 1658 (if (eq noerase 'new) |
| 1659 (pop-to-buffer (generate-new-buffer "*mail*")) | 1659 (pop-to-buffer (generate-new-buffer "*mail*")) |
| 1660 (and noerase | |
| 1661 (not (get-buffer "*mail*")) | |
| 1662 (setq noerase nil)) | |
| 1660 (pop-to-buffer "*mail*")) | 1663 (pop-to-buffer "*mail*")) |
| 1661 | 1664 |
| 1662 ;; Avoid danger that the auto-save file can't be written. | 1665 ;; Avoid danger that the auto-save file can't be written. |
| 1663 (let ((dir (expand-file-name | 1666 (let ((dir (expand-file-name |
| 1664 (file-name-as-directory mail-default-directory)))) | 1667 (file-name-as-directory mail-default-directory)))) |
| 1671 (mail-mode) | 1674 (mail-mode) |
| 1672 ;; Disconnect the buffer from its visited file | 1675 ;; Disconnect the buffer from its visited file |
| 1673 ;; (in case the user has actually visited a file *mail*). | 1676 ;; (in case the user has actually visited a file *mail*). |
| 1674 ; (set-visited-file-name nil) | 1677 ; (set-visited-file-name nil) |
| 1675 (let (initialized) | 1678 (let (initialized) |
| 1676 (and (or (not noerase) | 1679 (and (not (and noerase |
| 1677 (eq noerase 'new)) | 1680 (not (eq noerase 'new)))) |
| 1678 (if buffer-file-name | 1681 (if buffer-file-name |
| 1679 (if (buffer-modified-p) | 1682 (if (buffer-modified-p) |
| 1680 (when (y-or-n-p "Buffer has unsaved changes; reinitialize it and discard them? ") | 1683 (when (y-or-n-p "Buffer has unsaved changes; reinitialize it and discard them? ") |
| 1681 (if (y-or-n-p "Disconnect buffer from visited file? ") | 1684 (if (y-or-n-p "Disconnect buffer from visited file? ") |
| 1682 (set-visited-file-name nil)) | 1685 (set-visited-file-name nil)) |