Changes committed gnus/lisp (ChangeLog mml.el)

Modified: ChangeLog mml.el

(mml-menu): Add workarounds for XEmacs.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1806 gnus/lisp/ChangeLog:7.1807
--- ChangeLog:7.1806	Thu Mar 20 11:00:31 2008
+++ ChangeLog	Thu Mar 20 19:12:45 2008
@@ -1,5 +1,7 @@
 2008-03-20  Reiner Steib  <[email protected]>
 
+	* mml.el (mml-menu): Add workarounds for XEmacs.
+
 	* gnus-art.el (gnus-article-browse-html-article): Inhibit display of
 	X-Boundary header.
 
Index: mml.el
diff -u gnus/lisp/mml.el:7.64 gnus/lisp/mml.el:7.65
--- mml.el:7.64	Wed Mar 19 17:11:30 2008
+++ mml.el	Thu Mar 20 19:12:45 2008
@@ -1034,13 +1034,20 @@
     ["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 (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"))]))