comparison lisp/gnus/mml.el @ 92694:d3767aa9ae49

Merge from gnus--devo--0 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1097
author Miles Bader <miles@gnu.org>
date Mon, 10 Mar 2008 00:50:22 +0000
parents 5f827896103e
children a789a1138b08
comparison
equal deleted inserted replaced
92693:2a2d2de297db 92694:d3767aa9ae49
1015 ;; `M-m' conflicts with `back-to-indentation'. 1015 ;; `M-m' conflicts with `back-to-indentation'.
1016 ;; (define-key main "\M-m" map) 1016 ;; (define-key main "\M-m" map)
1017 (define-key main "\C-c\C-m" map) 1017 (define-key main "\C-c\C-m" map)
1018 main)) 1018 main))
1019 1019
1020 ;; (defun mml-toggle-gcc-externalize-attachments ()
1021 ;; (interactive)
1022 ;; (prog1
1023 ;; (setq gnus-gcc-externalize-attachments
1024 ;; (not gnus-gcc-externalize-attachments))
1025 ;; (message "gnus-gcc-externalize-attachments is `%s'."
1026 ;; gnus-gcc-externalize-attachments)))
1027
1020 (easy-menu-define 1028 (easy-menu-define
1021 mml-menu mml-mode-map "" 1029 mml-menu mml-mode-map ""
1022 `("Attachments" 1030 `("Attachments"
1023 ["Attach File..." mml-attach-file 1031 ["Attach File..." mml-attach-file
1024 ,@(if (featurep 'xemacs) '(t) 1032 ,@(if (featurep 'xemacs) '(t)
1025 '(:help "Attach a file at point"))] 1033 '(:help "Attach a file at point"))]
1026 ["Attach Buffer..." mml-attach-buffer 1034 ["Attach Buffer..." mml-attach-buffer
1027 ,@(if (featurep 'xemacs) '(t) 1035 ,@(if (featurep 'xemacs) '(t)
1028 '(:help "Attach a buffer to the outgoing MIME message"))] 1036 '(:help "Attach a buffer to the outgoing message"))]
1029 ["Attach External..." mml-attach-external 1037 ["Attach External..." mml-attach-external
1030 ,@(if (featurep 'xemacs) '(t) 1038 ,@(if (featurep 'xemacs) '(t)
1031 '(:help "Attach reference to file"))] 1039 '(:help "Attach reference to an external file"))]
1040 ;; ["Externalize Attachments"
1041 ;; (lambda () (interactive) (mml-toggle-gcc-externalize-attachments))
1042 ;; ,@(if (featurep 'xemacs) nil
1043 ;; '(:help "Save attachments as external parts in Gcc copies"))
1044 ;; :visible (booleanp gnus-gcc-externalize-attachments)
1045 ;; :style radio
1046 ;; :selected (equal gnus-gcc-externalize-attachments t) ]
1047 "----"
1032 ;; 1048 ;;
1033 ("Change Security Method" 1049 ("Change Security Method"
1034 ["PGP/MIME" 1050 ["PGP/MIME"
1035 (lambda () (interactive) (setq mml-secure-method "pgpmime")) 1051 (lambda () (interactive) (setq mml-secure-method "pgpmime"))
1036 ,@(if (featurep 'xemacs) nil 1052 ,@(if (featurep 'xemacs) nil
1054 ["Encrypt Message" mml-secure-message-encrypt t] 1070 ["Encrypt Message" mml-secure-message-encrypt t]
1055 ["Sign and Encrypt Message" mml-secure-message-sign-encrypt t] 1071 ["Sign and Encrypt Message" mml-secure-message-sign-encrypt t]
1056 ["Encrypt/Sign off" mml-unsecure-message 1072 ["Encrypt/Sign off" mml-unsecure-message
1057 ,@(if (featurep 'xemacs) '(t) 1073 ,@(if (featurep 'xemacs) '(t)
1058 '(:help "Don't Encrypt/Sign Message"))] 1074 '(:help "Don't Encrypt/Sign Message"))]
1075 ;; Do we have separate encrypt and encrypt/sign commands for parts?
1076 ["Sign Part" mml-secure-sign t]
1077 ["Encrypt Part" mml-secure-encrypt t]
1078 "----"
1059 ;; Maybe we could remove these, because people who write MML most probably 1079 ;; Maybe we could remove these, because people who write MML most probably
1060 ;; don't use the menu: 1080 ;; don't use the menu:
1061 ["Insert Part..." mml-insert-part 1081 ["Insert Part..." mml-insert-part
1062 :active (message-in-body-p)] 1082 :active (message-in-body-p)]
1063 ["Insert Multipart..." mml-insert-multipart 1083 ["Insert Multipart..." mml-insert-multipart
1064 :active (message-in-body-p)] 1084 :active (message-in-body-p)]
1065 ;; 1085 ;;
1066 ;; Do we have separate encrypt and encrypt/sign commands for parts?
1067 ["Sign Part" mml-secure-sign t]
1068 ["Encrypt Part" mml-secure-encrypt t]
1069 ;;["Narrow" mml-narrow-to-part t] 1086 ;;["Narrow" mml-narrow-to-part t]
1070 ["Quote MML in region" mml-quote-region 1087 ["Quote MML in region" mml-quote-region
1071 :active (message-mark-active-p) 1088 :active (message-mark-active-p)
1072 ,@(if (featurep 'xemacs) nil 1089 ,@(if (featurep 'xemacs) nil
1073 '(:help "Quote MML tags in region"))] 1090 '(:help "Quote MML tags in region"))]
1220 If it is a list, valid members are `type', `description' and 1237 If it is a list, valid members are `type', `description' and
1221 `disposition'. `disposition' implies `type'. If it is nil, 1238 `disposition'. `disposition' implies `type'. If it is nil,
1222 don't ask for options. If it is t, ask the user whether or not 1239 don't ask for options. If it is t, ask the user whether or not
1223 to specify options." 1240 to specify options."
1224 :type '(choice 1241 :type '(choice
1225 (const :tag "Non" nil) 1242 (const :tag "None" nil)
1226 (const :tag "Query" t) 1243 (const :tag "Query" t)
1227 (list :value (type description disposition) 1244 (list :value (type description disposition)
1228 (set :inline t 1245 (set :inline t
1229 (const type) 1246 (const type)
1230 (const description) 1247 (const description)