mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-20 18:17:20 +00:00
Code Issues Releases Activity

(rmail-retry-failure): Rename local to rmail-this-buffer.

Browse Source 
(rmail-primary-inbox-list): Don't use backquote.
This commit is contained in:
Richard M. Stallman 1997-05-15 20:17:08 +00:00
parent b00ca0d7ea
commit 2079601b89
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lisp/mail/rmail.el
View File

@ -170,11 +170,13 @@ See also `rmail-highlight-face'."
`nil' means the default, which is (\"/usr/spool/mail/$USER\") `nil' means the default, which is (\"/usr/spool/mail/$USER\")
\(the name varies depending on the operating system, \(the name varies depending on the operating system,
and the value of the environment variable MAIL overrides it)." and the value of the environment variable MAIL overrides it)."
:type `(choice (const :tag "Default" nil) ;; Don't use backquote here, because we don't want to need it
(repeat :value (,(or (getenv "MAIL") ;; at load time.
(concat "/var/spool/mail/" :type (list 'choice '(const :tag "Default" nil)
(getenv "USER")))) (list 'repeat ':value ,(or (getenv "MAIL")
file)) (concat "/var/spool/mail/"
(getenv "USER")))
'file))
:group 'rmail-retrieve :group 'rmail-retrieve
:group 'rmail-files) :group 'rmail-files)
@ -2725,7 +2727,7 @@ The variable `rmail-retry-ignored-headers' is a regular expression
specifying headers which should not be copied into the new message." specifying headers which should not be copied into the new message."
(interactive) (interactive)
(require 'mail-utils) (require 'mail-utils)
(let ((rmail-buffer (current-buffer)) (let ((rmail-this-buffer (current-buffer))
(msgnum rmail-current-message) (msgnum rmail-current-message)
bounce-start bounce-end bounce-indent resending) bounce-start bounce-end bounce-indent resending)
(save-excursion (save-excursion
@ -2797,9 +2799,9 @@ specifying headers which should not be copied into the new message."
;; Turn off the usual actions for initializing the message body ;; Turn off the usual actions for initializing the message body
;; because we want to get only the text from the failure message. ;; because we want to get only the text from the failure message.
(let (mail-signature mail-setup-hook) (let (mail-signature mail-setup-hook)
(if (rmail-start-mail nil nil nil nil nil rmail-buffer (if (rmail-start-mail nil nil nil nil nil rmail-this-buffer
(list (list 'rmail-mark-message (list (list 'rmail-mark-message
rmail-buffer rmail-this-buffer
(aref rmail-msgref-vector msgnum) (aref rmail-msgref-vector msgnum)
"retried"))) "retried")))
;; Insert original text as initial text of new draft message. ;; Insert original text as initial text of new draft message.
@ -2807,7 +2809,7 @@ specifying headers which should not be copied into the new message."
;; of the previous message was probably read-only. ;; of the previous message was probably read-only.
(let ((inhibit-read-only t)) (let ((inhibit-read-only t))
(erase-buffer) (erase-buffer)
(insert-buffer-substring rmail-buffer bounce-start bounce-end) (insert-buffer-substring rmail-this-buffer bounce-start bounce-end)
(goto-char (point-min)) (goto-char (point-min))
(if bounce-indent (if bounce-indent
(indent-rigidly (point-min) (point-max) bounce-indent)) (indent-rigidly (point-min) (point-max) bounce-indent))
@ -2825,7 +2827,7 @@ specifying headers which should not be copied into the new message."
(insert "BCC: " (user-login-name) "\n")))) (insert "BCC: " (user-login-name) "\n"))))
(insert mail-header-separator) (insert mail-header-separator)
(mail-position-on-field (if resending "Resent-To" "To") t) (mail-position-on-field (if resending "Resent-To" "To") t)
(set-buffer rmail-buffer) (set-buffer rmail-this-buffer)
(rmail-beginning-of-message)))))) (rmail-beginning-of-message))))))
(defun rmail-summary-exists () (defun rmail-summary-exists ()