[Emacs-diffs] Changes to emacs/lisp/mail/rmail.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/mail/rmail.el
diff -c emacs/lisp/mail/rmail.el:1.371.4.3 emacs/lisp/mail/rmail.el:1.371.4.4
*** emacs/lisp/mail/rmail.el:1.371.4.3  Fri Apr 16 12:50:31 2004
--- emacs/lisp/mail/rmail.el    Mon Jun 28 07:29:47 2004
***************
*** 227,233 ****
  
  ;;;###autoload
  (defcustom rmail-mail-new-frame nil
!   "*Non-nil means Rmail makes a new frame for composing outgoing mail."
    :type 'boolean
    :group 'rmail-reply)
  
--- 227,235 ----
  
  ;;;###autoload
  (defcustom rmail-mail-new-frame nil
!   "*Non-nil means Rmail makes a new frame for composing outgoing mail.
! This is handy if you want to preserve the window configuration of
! the frame where you have the RMAIL buffer displayed."
    :type 'boolean
    :group 'rmail-reply)
  
***************
*** 1137,1143 ****
    (make-local-variable 'kill-buffer-hook)
    (add-hook 'kill-buffer-hook 'rmail-mode-kill-summary)
    (make-local-variable 'file-precious-flag)
!   (setq file-precious-flag t))
  
  ;; Handle M-x revert-buffer done in an rmail-mode buffer.
  (defun rmail-revert (arg noconfirm)
--- 1139,1147 ----
    (make-local-variable 'kill-buffer-hook)
    (add-hook 'kill-buffer-hook 'rmail-mode-kill-summary)
    (make-local-variable 'file-precious-flag)
!   (setq file-precious-flag t)
!   (make-local-variable 'desktop-save-buffer)
!   (setq desktop-save-buffer t))
  
  ;; Handle M-x revert-buffer done in an rmail-mode buffer.
  (defun rmail-revert (arg noconfirm)
***************
*** 1666,1672 ****
  (defun rmail-decode-region (from to coding)
    (if (or (not coding) (not (coding-system-p coding)))
        (setq coding 'undecided))
!   (decode-coding-region from to coding))
  
  ;; the  rmail-break-forwarded-messages  feature is not implemented
  (defun rmail-convert-to-babyl-format ()
--- 1670,1684 ----
  (defun rmail-decode-region (from to coding)
    (if (or (not coding) (not (coding-system-p coding)))
        (setq coding 'undecided))
!   ;; Use -dos decoding, to remove ^M characters left from base64 or
!   ;; rogue qp-encoded text.
!   (decode-coding-region from to
!                       (coding-system-change-eol-conversion coding 1))
!   ;; Don't reveal the fact we used -dos decoding, as users generally
!   ;; will not expect the RMAIL buffer to use DOS EOL format.
!   (setq buffer-file-coding-system
!       (setq last-coding-system-used
!             (coding-system-change-eol-conversion coding 0))))
  
  ;; the  rmail-break-forwarded-messages  feature is not implemented
  (defun rmail-convert-to-babyl-format ()
***************
*** 1751,1759 ****
                               (error nil))
                           ;; Change "base64" to "8bit", to reflect the
                           ;; decoding we just did.
-                          (goto-char (1+ header-end))
-                          (while (search-forward "\r\n" (point-max) t)
-                            (replace-match "\n"))
                           (goto-char base64-header-field-end)
                           (delete-region (point) (search-backward ":"))
                           (insert ": 8bit"))))
--- 1763,1768 ----
***************
*** 1901,1909 ****
                                    (point)))
                                 t)
                             (error nil))
-                        (goto-char header-end)
-                        (while (search-forward "\r\n" (point-max) t)
-                          (replace-match "\n"))
                         ;; Change "base64" to "8bit", to reflect the
                         ;; decoding we just did.
                         (goto-char base64-header-field-end)
--- 1910,1915 ----
***************
*** 3167,3173 ****
        (compose-mail to subject others
                      noerase nil
                      yank-action sendactions)
!       (if (and (display-multi-frame-p) rmail-mail-new-frame)
          (prog1
              (compose-mail to subject others
                            noerase 'switch-to-buffer-other-frame
--- 3173,3179 ----
        (compose-mail to subject others
                      noerase nil
                      yank-action sendactions)
!       (if rmail-mail-new-frame
          (prog1
              (compose-mail to subject others
                            noerase 'switch-to-buffer-other-frame
***************
*** 3867,3872 ****
--- 3873,3895 ----
       (setq i (1+ i)))
     (concat string-vector)))
  
+ ;;;;  Desktop support
+ 
+ ;;;###autoload
+ (defun rmail-restore-desktop-buffer (desktop-buffer-file-name
+                                      desktop-buffer-name
+                                      desktop-buffer-misc)
+   "Restore an rmail buffer specified in a desktop file."
+   (condition-case error
+       (progn
+         (rmail-input desktop-buffer-file-name)
+         (if (eq major-mode 'rmail-mode)
+             (current-buffer)
+           rmail-buffer))
+     (file-locked
+       (kill-buffer (current-buffer))
+       nil)))
+ 
  (provide 'rmail)
  
  ;;; arch-tag: cff0a950-57fe-4f73-a86e-91ff75afd06c