HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 2012 to FSF copyright years for Emacs files
[bpt/emacs.git]
/
lisp
/
mh-e
/
mh-comp.el
diff --git
a/lisp/mh-e/mh-comp.el
b/lisp/mh-e/mh-comp.el
index
3bb1e34
..
b2a5f02
100644
(file)
--- a/
lisp/mh-e/mh-comp.el
+++ b/
lisp/mh-e/mh-comp.el
@@
-1,8
+1,6
@@
;;; mh-comp.el --- MH-E functions for composing and sending messages
;;; mh-comp.el --- MH-E functions for composing and sending messages
-;; Copyright (C) 1993, 1995, 1997,
-;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 1997, 2000-2012 Free Software Foundation, Inc.
;; Author: Bill Wohler <wohler@newt.com>
;; Maintainer: Bill Wohler <wohler@newt.com>
;; Author: Bill Wohler <wohler@newt.com>
;; Maintainer: Bill Wohler <wohler@newt.com>
@@
-199,7
+197,8
@@
applications should use `mh-user-agent-compose'."
;;;###autoload
(defun mh-user-agent-compose (&optional to subject other-headers continue
switch-function yank-action
;;;###autoload
(defun mh-user-agent-compose (&optional to subject other-headers continue
switch-function yank-action
- send-actions)
+ send-actions return-action
+ &rest ignored)
"Set up mail composition draft with the MH mail system.
This is the `mail-user-agent' entry point to MH-E. This function
conforms to the contract specified by `define-mail-user-agent'
"Set up mail composition draft with the MH mail system.
This is the `mail-user-agent' entry point to MH-E. This function
conforms to the contract specified by `define-mail-user-agent'
@@
-213,8
+212,8
@@
OTHER-HEADERS is an alist specifying additional header fields.
Elements look like (HEADER . VALUE) where both HEADER and VALUE
are strings.
Elements look like (HEADER . VALUE) where both HEADER and VALUE
are strings.
-CONTINUE, SWITCH-FUNCTION, YANK-ACTION
and SEND-ACTIONS are
-
ignored
."
+CONTINUE, SWITCH-FUNCTION, YANK-ACTION
, SEND-ACTIONS, and
+
RETURN-ACTION and any additional arguments are IGNORED
."
(mh-find-path)
(let ((mh-error-if-no-draft t))
(mh-send to "" subject)
(mh-find-path)
(let ((mh-error-if-no-draft t))
(mh-send to "" subject)
@@
-224,7
+223,8
@@
ignored."
(setq other-headers (cdr other-headers)))))
;; Shush compiler.
(setq other-headers (cdr other-headers)))))
;; Shush compiler.
-(defvar sendmail-coding-system) ; XEmacs
+(mh-do-in-xemacs
+ (defvar sendmail-coding-system))
;;;###autoload
(defun mh-send-letter (&optional arg)
;;;###autoload
(defun mh-send-letter (&optional arg)
@@
-504,7
+504,7
@@
See also `mh-compose-forward-as-mime-flag',
folder msg)
;; Was inserted before us, move to end of file to preserve order
(goto-char (point-max)))))))
folder msg)
;; Was inserted before us, move to end of file to preserve order
(goto-char (point-max)))))))
- ;; Pos
tition just before forwarded message
+ ;; Pos
ition just before forwarded message.
(if (re-search-forward "^------- Forwarded Message" nil t)
(forward-line -1)
(goto-char (mh-mail-header-end))
(if (re-search-forward "^------- Forwarded Message" nil t)
(forward-line -1)
(goto-char (mh-mail-header-end))
@@
-905,6
+905,9
@@
letter."
(mh-identity-make-menu)
(mh-identity-add-menu)
(mh-identity-make-menu)
(mh-identity-add-menu)
+ ;; Cleanup possibly RFC2047 encoded subject header
+ (mh-decode-message-subject)
+
;; Insert extra fields.
(mh-insert-x-mailer)
(mh-insert-x-face)
;; Insert extra fields.
(mh-insert-x-mailer)
(mh-insert-x-face)
@@
-1109,5
+1112,4
@@
doesn't exist there."
;; sentence-end-double-space: nil
;; End:
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 62865511-e610-4923-b0b5-f45a8ab70a34
;;; mh-comp.el ends here
;;; mh-comp.el ends here