(mml-menu): Add workarounds for XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4244475..98ccc1b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2008-03-20  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * mml.el (mml-menu): Add workarounds for XEmacs.
+
        * gnus-art.el (gnus-article-browse-html-article): Inhibit display of
        X-Boundary header.
 

diff --git a/lisp/mml.el b/lisp/mml.el
index 4fdef84..79a1de7 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -1034,13 +1034,20 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
     ["Externalize Attachments"
      (lambda ()
        (interactive)
-       (setq gnus-gcc-externalize-attachments
-            (not gnus-gcc-externalize-attachments))
-       (message "gnus-gcc-externalize-attachments is `%s'."
-               gnus-gcc-externalize-attachments))
-     :visible (and (boundp 'gnus-gcc-externalize-attachments)
-                  (memq gnus-gcc-externalize-attachments
-                        '(all t nil)))
+       (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
@@ -1096,11 +1103,15 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
      ,@(if (featurep 'xemacs) '(t)
         '(:help "Display the Emacs MIME manual"))]
     ["PGG manual" (lambda () (interactive) (message-info mml2015-use))
-     :visible (equal mml2015-use 'pgg)
+     ;; 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))
-     :visible (equal mml2015-use 'epg)
+     ;; XEmacs barfs on :visible.
+     ,@(if (featurep 'xemacs) nil
+        '(:visible (equal mml2015-use 'epg)))
      ,@(if (featurep 'xemacs) '(t)
         '(:help "Display the EasyPG manual"))]))