diff options
| author | Kenichi Handa <handa@m17n.org> | 2011-01-12 15:11:40 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2011-01-12 15:11:40 +0900 |
| commit | 07ee9351461ff93feabd66f36ccfdc0ff7b5dcfc (patch) | |
| tree | c5c619a64600c6d76b3c3134037baeabf73d191b /lisp/gnus | |
| parent | e7ca0062a4899a2cc5f8b0793eb0bca58efea855 (diff) | |
| parent | ae01d7ca64c60e98e2a37231c4b33271c5f78f31 (diff) | |
| download | emacs-07ee9351461ff93feabd66f36ccfdc0ff7b5dcfc.tar.gz | |
merge emacs-23
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/gnus/message.el | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index f8d0a1cb902..6a363c0b4f1 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2011-01-12 Glenn Morris <rgm@gnu.org> + + * message.el (message-mail): A compose-mail function should + accept headers as strings. + 2010-11-19 Yuri Karaban <tech@askold.net> (tiny change) * pop3.el (pop3-open-server): Read server greeting before starting TLS @@ -13920,4 +13925,3 @@ See ChangeLog.2 for earlier changes. ;; add-log-time-zone-rule: t ;; End: -;;; arch-tag: 3f33a3e7-090d-492b-bedd-02a1417d32b4 diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 867798f9dcb..0ea0df46060 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -6493,7 +6493,13 @@ is a function used to switch to and display the mail buffer." (message-setup (nconc `((To . ,(or to "")) (Subject . ,(or subject ""))) - (when other-headers other-headers)) + ;; C-h f compose-mail says that headers should be specified as + ;; (string . value); however all the rest of message expects + ;; headers to be symbols, not strings (eg message-header-format-alist). + ;; http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html + ;; We need to convert any string input, eg from rmail-start-mail. + (dolist (h other-headers other-headers) + (if (stringp (car h)) (setcar h (intern (capitalize (car h))))))) yank-action send-actions continue switch-function) ;; FIXME: Should return nil if failure. t)) @@ -8195,5 +8201,4 @@ Used in `message-simplify-recipients'." ;; coding: iso-8859-1 ;; End: -;; arch-tag: 94b32cac-4504-4b6c-8181-030ebf380ee0 ;;; message.el ends here |