(define-key map "\C-c\C-w" 'mail-signature)
(define-key map "\C-c\C-c" 'mail-send-and-exit)
(define-key map "\C-c\C-s" 'mail-send)
- (define-key map "\C-c\C-i" 'mail-attach-file)
+ (define-key map "\C-c\C-i" 'mail-insert-file)
;; FIXME add this? "b" = bury buffer. It's in the menu-bar.
;;; (define-key map "\C-c\C-b" 'mail-dont-send)
;; a second time, probably because someone's using an old value
;; of send-mail-function.
(when (eq send-mail-function 'sendmail-query-once)
- (let* ((options `(("mail client" . mailclient-send-it)
- ,@(when (and sendmail-program
- (executable-find sendmail-program))
- '(("transport" . sendmail-send-it)))
- ("smtp" . smtpmail-send-it)))
- (choice
- ;; Query the user.
- (with-temp-buffer
- (rename-buffer "*Emacs Mail Setup Help*" t)
- (insert "\
+ (sendmail-query-user-about-smtp))
+ (funcall send-mail-function))
+
+(defun sendmail-query-user-about-smtp ()
+ (let* ((options `(("mail client" . mailclient-send-it)
+ ,@(when (and sendmail-program
+ (executable-find sendmail-program))
+ '(("transport" . sendmail-send-it)))
+ ("smtp" . smtpmail-send-it)))
+ (choice
+ ;; Query the user.
+ (with-temp-buffer
+ (rename-buffer "*Emacs Mail Setup Help*" t)
+ (insert "\
Emacs is about to send an email message, but it has not been
configured for sending email. To tell Emacs how to send email:
- Type `"
- (propertize "mail client" 'face 'bold)
- "' to start your default email client and
+ (propertize "mail client" 'face 'bold)
+ "' to start your default email client and
pass it the message text.\n\n")
- (and sendmail-program
- (executable-find sendmail-program)
- (insert "\
+ (and sendmail-program
+ (executable-find sendmail-program)
+ (insert "\
- Type `"
- (propertize "transport" 'face 'bold)
- "' to invoke the system's mail transport agent
+ (propertize "transport" 'face 'bold)
+ "' to invoke the system's mail transport agent
(the `"
- sendmail-program
- "' program).\n\n"))
- (insert "\
+ sendmail-program
+ "' program).\n\n"))
+ (insert "\
- Type `"
- (propertize "smtp" 'face 'bold)
- "' to send mail directly to an \"outgoing mail\" server.
+ (propertize "smtp" 'face 'bold)
+ "' to send mail directly to an \"outgoing mail\" server.
(Emacs may prompt you for SMTP settings).
Emacs will record your selection and will use it thereafter.
To change it later, customize the option `send-mail-function'.\n")
- (goto-char (point-min))
- (display-buffer (current-buffer))
- (let ((completion-ignore-case t))
- (completing-read "Send mail via: "
- options nil 'require-match)))))
- (customize-save-variable 'send-mail-function
- (cdr (assoc-string choice options t)))))
- (funcall send-mail-function))
+ (goto-char (point-min))
+ (display-buffer (current-buffer))
+ (let ((completion-ignore-case t))
+ (completing-read "Send mail via: "
+ options nil 'require-match)))))
+ (customize-save-variable 'send-mail-function
+ (cdr (assoc-string choice options t)))))
\f
(defun sendmail-sync-aliases ()
(when mail-personal-alias-file
;; (kill-local-variable 'enable-multibyte-characters)
(set-buffer-multibyte (default-value 'enable-multibyte-characters))
(if current-input-method
- (inactivate-input-method))
+ (deactivate-input-method))
;; Local variables for Mail mode.
(setq mail-send-actions actions)
(defun mail-bury (&optional arg)
"Bury this mail buffer."
(let ((newbuf (other-buffer (current-buffer)))
- (return-action mail-return-action)
- some-rmail)
+ (return-action mail-return-action))
(bury-buffer (current-buffer))
;; If there is an Rmail buffer, return to it nicely
;; even if this message was not started by an Rmail command.
(unless return-action
(dolist (buffer (buffer-list))
- (if (eq (buffer-local-value 'major-mode buffer) 'rmail-mode)
- (setq return-action `(rmail-mail-return ,newbuf)))))
+ (if (and (eq (buffer-local-value 'major-mode buffer) 'rmail-mode)
+ (null return-action)
+ ;; Don't match message-viewer buffer.
+ (not (string-match "\\` " (buffer-name buffer))))
+ (setq return-action `(rmail-mail-return ,buffer)))))
(if (and (null arg) return-action)
(apply (car return-action) (cdr return-action))
(switch-to-buffer newbuf))))
;;;###autoload
(defvar sendmail-coding-system nil
- "*Coding system for encoding the outgoing mail.
+ "Coding system for encoding the outgoing mail.
This has higher priority than the default `buffer-file-coding-system'
and `default-sendmail-coding-system',
but lower priority than the local value of `buffer-file-coding-system'.
(cons selected mm-coding-system-priorities)
mm-coding-system-priorities))
(tick (buffer-chars-modified-tick))
+ ;; Many mailers, including Gnus, passes a message of which
+ ;; the header is already encoded, so this is necessary to
+ ;; prevent it from being encoded again.
(rfc2047-encode-encoded-words nil))
(rfc2047-encode-message-header)
(= tick (buffer-chars-modified-tick)))))
and don't delete any header fields."
(interactive "P")
(and (consp mail-reply-action)
- (eq (car mail-reply-action) 'insert-buffer)
+ (memq (car mail-reply-action)
+ '(rmail-yank-current-message insert-buffer))
(with-current-buffer (nth 1 mail-reply-action)
(or (mark t)
(error "No mark set: %S" (current-buffer))))
HCoop / bpt / emacs.git / blobdiff