[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/gnus/mml.el,v
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/gnus/mml.el,v |
Date: |
Sat, 29 Mar 2008 19:54:12 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 08/03/29 19:54:11
Index: lisp/gnus/mml.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/mml.el,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- lisp/gnus/mml.el 10 Mar 2008 00:50:20 -0000 1.51
+++ lisp/gnus/mml.el 29 Mar 2008 19:54:08 -0000 1.52
@@ -1017,14 +1017,6 @@
(define-key main "\C-c\C-m" map)
main))
-;; (defun mml-toggle-gcc-externalize-attachments ()
-;; (interactive)
-;; (prog1
-;; (setq gnus-gcc-externalize-attachments
-;; (not gnus-gcc-externalize-attachments))
-;; (message "gnus-gcc-externalize-attachments is `%s'."
-;; gnus-gcc-externalize-attachments)))
-
(easy-menu-define
mml-menu mml-mode-map ""
`("Attachments"
@@ -1037,13 +1029,29 @@
["Attach External..." mml-attach-external
,@(if (featurep 'xemacs) '(t)
'(:help "Attach reference to an external file"))]
- ;; ["Externalize Attachments"
- ;; (lambda () (interactive) (mml-toggle-gcc-externalize-attachments))
- ;; ,@(if (featurep 'xemacs) nil
- ;; '(:help "Save attachments as external parts in Gcc copies"))
- ;; :visible (booleanp gnus-gcc-externalize-attachments)
- ;; :style radio
- ;; :selected (equal gnus-gcc-externalize-attachments t) ]
+ ;; FIXME: Is it possible to do this without using
+ ;; `gnus-gcc-externalize-attachments'?
+ ["Externalize Attachments"
+ (lambda ()
+ (interactive)
+ (if (not (and (boundp 'gnus-gcc-externalize-attachments)
+ (memq gnus-gcc-externalize-attachments
+ '(all t nil))))
+ ;; Stupid workaround for XEmacs not honoring :visible.
+ (message "Can't handle this value of
`gnus-gcc-externalize-attachments'")
+ (setq gnus-gcc-externalize-attachments
+ (not gnus-gcc-externalize-attachments))
+ (message "gnus-gcc-externalize-attachments is `%s'."
+ gnus-gcc-externalize-attachments)))
+ ;; XEmacs barfs on :visible.
+ ,@(if (featurep 'xemacs) nil
+ '(:visible (and (boundp 'gnus-gcc-externalize-attachments)
+ (memq gnus-gcc-externalize-attachments
+ '(all t nil)))))
+ :style toggle
+ :selected gnus-gcc-externalize-attachments
+ ,@(if (featurep 'xemacs) nil
+ '(:help "Save attachments as external parts in Gcc copies"))]
"----"
;;
("Change Security Method"
@@ -1094,9 +1102,18 @@
["Emacs MIME manual" (lambda () (interactive) (message-info 4))
,@(if (featurep 'xemacs) '(t)
'(:help "Display the Emacs MIME manual"))]
- ["PGG manual" (lambda () (interactive) (message-info 16))
+ ["PGG manual" (lambda () (interactive) (message-info mml2015-use))
+ ;; XEmacs barfs on :visible.
+ ,@(if (featurep 'xemacs) nil
+ '(:visible (equal mml2015-use 'pgg)))
+ ,@(if (featurep 'xemacs) '(t)
+ '(:help "Display the PGG manual"))]
+ ["EasyPG manual" (lambda () (interactive) (message-info mml2015-use))
+ ;; XEmacs barfs on :visible.
+ ,@(if (featurep 'xemacs) nil
+ '(:visible (equal mml2015-use 'epg)))
,@(if (featurep 'xemacs) '(t)
- '(:help "Display the PGG manual"))]))
+ '(:help "Display the EasyPG manual"))]))
(defvar mml-mode nil
"Minor mode for editing MML.")