Mercurial > emacs
comparison lisp/gnus/mml.el @ 91302:56a72e2bd635
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-306
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 29 Dec 2007 02:39:17 +0000 |
parents | 2fcaae6177a5 13b76cb6c8fa |
children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
91301:7774e5860c70 | 91302:56a72e2bd635 |
---|---|
44 (autoload 'message-mark-active-p "message") | 44 (autoload 'message-mark-active-p "message") |
45 (autoload 'message-info "message") | 45 (autoload 'message-info "message") |
46 (autoload 'fill-flowed-encode "flow-fill") | 46 (autoload 'fill-flowed-encode "flow-fill") |
47 (autoload 'message-posting-charset "message") | 47 (autoload 'message-posting-charset "message") |
48 (autoload 'dnd-get-local-file-name "dnd")) | 48 (autoload 'dnd-get-local-file-name "dnd")) |
49 | |
50 (autoload 'message-options-set "message") | |
51 (autoload 'message-narrow-to-head "message") | |
52 (autoload 'message-in-body-p "message") | |
53 (autoload 'message-mail-p "message") | |
49 | 54 |
50 (defvar gnus-article-mime-handles) | 55 (defvar gnus-article-mime-handles) |
51 (defvar gnus-mouse-2) | 56 (defvar gnus-mouse-2) |
52 (defvar gnus-newsrc-hashtb) | 57 (defvar gnus-newsrc-hashtb) |
53 (defvar message-default-charset) | 58 (defvar message-default-charset) |
833 | 838 |
834 ;;; | 839 ;;; |
835 ;;; Transforming MIME to MML | 840 ;;; Transforming MIME to MML |
836 ;;; | 841 ;;; |
837 | 842 |
843 ;; message-narrow-to-head autoloads message. | |
844 (declare-function message-remove-header "message" | |
845 (header &optional is-regexp first reverse)) | |
846 | |
838 (defun mime-to-mml (&optional handles) | 847 (defun mime-to-mml (&optional handles) |
839 "Translate the current buffer (which should be a message) into MML. | 848 "Translate the current buffer (which should be a message) into MML. |
840 If HANDLES is non-nil, use it instead reparsing the buffer." | 849 If HANDLES is non-nil, use it instead reparsing the buffer." |
841 ;; First decode the head. | 850 ;; First decode the head. |
842 (save-restriction | 851 (save-restriction |
857 ;; Remove them, they are confusing. | 866 ;; Remove them, they are confusing. |
858 (message-remove-header "Content-Type") | 867 (message-remove-header "Content-Type") |
859 (message-remove-header "MIME-Version") | 868 (message-remove-header "MIME-Version") |
860 (message-remove-header "Content-Disposition") | 869 (message-remove-header "Content-Disposition") |
861 (message-remove-header "Content-Transfer-Encoding"))) | 870 (message-remove-header "Content-Transfer-Encoding"))) |
871 | |
872 (autoload 'message-encode-message-body "message") | |
873 (declare-function message-narrow-to-headers-or-head "message" ()) | |
862 | 874 |
863 (defun mml-to-mime () | 875 (defun mml-to-mime () |
864 "Translate the current buffer from MML to MIME." | 876 "Translate the current buffer from MML to MIME." |
865 (message-encode-message-body) | 877 (message-encode-message-body) |
866 (save-restriction | 878 (save-restriction |
1305 (interactive | 1317 (interactive |
1306 (list (mml-minibuffer-read-type ""))) | 1318 (list (mml-minibuffer-read-type ""))) |
1307 (mml-insert-tag 'part 'type type 'disposition "inline") | 1319 (mml-insert-tag 'part 'type type 'disposition "inline") |
1308 (forward-line -1)) | 1320 (forward-line -1)) |
1309 | 1321 |
1322 (declare-function message-subscribed-p "message" ()) | |
1323 (declare-function message-make-mail-followup-to "message" | |
1324 (&optional only-show-subscribed)) | |
1325 (declare-function message-position-on-field "message" (header &rest afters)) | |
1326 | |
1310 (defun mml-preview-insert-mail-followup-to () | 1327 (defun mml-preview-insert-mail-followup-to () |
1311 "Insert a Mail-Followup-To header before previewing an article. | 1328 "Insert a Mail-Followup-To header before previewing an article. |
1312 Should be adopted if code in `message-send-mail' is changed." | 1329 Should be adopted if code in `message-send-mail' is changed." |
1313 (when (and (message-mail-p) | 1330 (when (and (message-mail-p) |
1314 (message-subscribed-p) | 1331 (message-subscribed-p) |
1322 (autoload 'gnus-make-hashtable "gnus-util") | 1339 (autoload 'gnus-make-hashtable "gnus-util") |
1323 (autoload 'widget-button-press "wid-edit" nil t) | 1340 (autoload 'widget-button-press "wid-edit" nil t) |
1324 (declare-function widget-event-point "wid-edit" (event)) | 1341 (declare-function widget-event-point "wid-edit" (event)) |
1325 ;; If gnus-buffer-configuration is bound this is loaded. | 1342 ;; If gnus-buffer-configuration is bound this is loaded. |
1326 (declare-function gnus-configure-windows "gnus-win" (setting &optional force)) | 1343 (declare-function gnus-configure-windows "gnus-win" (setting &optional force)) |
1344 ;; Called after message-mail-p, which autoloads message. | |
1345 (declare-function message-news-p "message" ()) | |
1346 (declare-function message-options-set-recipient "message" ()) | |
1347 (declare-function message-generate-headers "message" (headers)) | |
1348 (declare-function message-sort-headers "message" ()) | |
1327 | 1349 |
1328 (defun mml-preview (&optional raw) | 1350 (defun mml-preview (&optional raw) |
1329 "Display current buffer with Gnus, in a new buffer. | 1351 "Display current buffer with Gnus, in a new buffer. |
1330 If RAW, display a raw encoded MIME message. | 1352 If RAW, display a raw encoded MIME message. |
1331 | 1353 |