[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/mail/sendmail.el
From: |
Markus Rost |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/mail/sendmail.el |
Date: |
Mon, 20 May 2002 12:05:28 -0400 |
Index: emacs/lisp/mail/sendmail.el
diff -c emacs/lisp/mail/sendmail.el:1.255 emacs/lisp/mail/sendmail.el:1.256
*** emacs/lisp/mail/sendmail.el:1.255 Sun May 12 13:28:42 2002
--- emacs/lisp/mail/sendmail.el Mon May 20 12:05:28 2002
***************
*** 257,263 ****
which is the standard way to delimit a signature in a message.)
Otherwise, it should be an expression; it is evaluated
and should insert whatever you want to insert."
! :type '(choice (const "None" nil)
(const :tag "Use `.signature' file" t)
(string :tag "String to insert")
(sexp :tag "Expression to evaluate"))
--- 257,263 ----
which is the standard way to delimit a signature in a message.)
Otherwise, it should be an expression; it is evaluated
and should insert whatever you want to insert."
! :type '(choice (const :tag "None" nil)
(const :tag "Use `.signature' file" t)
(string :tag "String to insert")
(sexp :tag "Expression to evaluate"))
***************
*** 269,274 ****
--- 269,282 ----
:type 'file
:group 'sendmail)
+ ;;;###autoload
+ (defcustom mail-default-directory "~/"
+ "*Directory for mail buffers.
+ Value of `default-directory' for mail buffers.
+ This directory is used for auto-save files of mail buffers."
+ :type '(directory :tag "Directory")
+ :group 'sendmail)
+
(defvar mail-reply-action nil)
(defvar mail-send-actions nil
"A list of actions to be performed upon successful sending of a message.")
***************
*** 1513,1522 ****
;;; (message "Auto save file for draft message exists; consider M-x
mail-recover"))
;;; t))
(pop-to-buffer "*mail*")
! ;; Put the auto-save file in the home dir
! ;; to avoid any danger that it can't be written.
! (if (file-exists-p (expand-file-name "~/"))
! (setq default-directory (expand-file-name "~/")))
;; Only call auto-save-mode if necessary, to avoid changing auto-save file.
(if (or (and auto-save-default (not buffer-auto-save-file-name))
(and (not auto-save-default) buffer-auto-save-file-name))
--- 1521,1531 ----
;;; (message "Auto save file for draft message exists; consider M-x
mail-recover"))
;;; t))
(pop-to-buffer "*mail*")
! ;; Avoid danger that the auto-save file can't be written.
! (let ((dir (expand-file-name
! (file-name-as-directory mail-default-directory))))
! (if (file-exists-p dir)
! (setq default-directory dir)))
;; Only call auto-save-mode if necessary, to avoid changing auto-save file.
(if (or (and auto-save-default (not buffer-auto-save-file-name))
(and (not auto-save-default) buffer-auto-save-file-name))
***************
*** 1563,1569 ****
(setq non-random-len
(- (length file-name) (length (make-temp-name "")) 1))
(setq wildcard (concat (substring file-name 0 non-random-len) "*"))
- (debug)
(if (null (file-expand-wildcards wildcard))
(message "There are no auto-saved drafts to recover")
;; Bind dired-trivial-filenames to t because all auto-save file
--- 1572,1577 ----
***************
*** 1633,1640 ****
(switch-to-buffer "*mail*")
;; If *mail* didn't exist, set its directory, so that auto-saved
;; drafts will be found.
! (if (file-exists-p (expand-file-name "~/"))
! (setq default-directory "~/"))
(or (eq major-mode 'mail-mode)
(mail-mode))
(let ((file-name buffer-auto-save-file-name))
--- 1641,1650 ----
(switch-to-buffer "*mail*")
;; If *mail* didn't exist, set its directory, so that auto-saved
;; drafts will be found.
! (let ((dir (expand-file-name
! (file-name-as-directory mail-default-directory))))
! (if (file-exists-p dir)
! (setq default-directory dir)))
(or (eq major-mode 'mail-mode)
(mail-mode))
(let ((file-name buffer-auto-save-file-name))