Changes committed gnus/lisp (ChangeLog message.el mml.el)

Modified: ChangeLog message.el mml.el

* message.el (message-info): Hanlde EasyPG manual.

* mml.el (mml-menu): Add entry for EasyPG.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1798 gnus/lisp/ChangeLog:7.1799
--- ChangeLog:7.1798	Tue Mar 18 23:59:24 2008
+++ ChangeLog	Wed Mar 19 17:02:22 2008
@@ -1,3 +1,9 @@
+2008-03-19  Reiner Steib  <[email protected]>
+
+	* message.el (message-info): Hanlde EasyPG manual.
+
+	* mml.el (mml-menu): Add entry for EasyPG.
+
 2008-03-18  Nils Ackermann  <[email protected]>  (tiny change)
 
 	* nnmh.el (nnmh-request-expire-articles): Prefer expiry-target group
Index: message.el
diff -u gnus/lisp/message.el:7.246 gnus/lisp/message.el:7.247
--- message.el:7.246	Tue Mar 18 23:59:24 2008
+++ message.el	Wed Mar 19 17:02:22 2008
@@ -2478,12 +2478,18 @@
 (defun message-info (&optional arg)
   "Display the Message manual.
 
-Prefixed with one \\[universal-argument], display the Emacs MIME manual.
-Prefixed with two \\[universal-argument]'s, display the PGG manual."
+Prefixed with one \\[universal-argument], display the Emacs MIME
+manual.  With two \\[universal-argument]'s, display the EasyPG or
+PGG manual, depending on the value of `mml2015-use'."
   (interactive "p")
-  (cond ((eq arg 16) (Info-goto-node "(pgg)Top"))
-	((eq arg  4) (Info-goto-node "(emacs-mime)Top"))
-	(t           (Info-goto-node "(message)Top"))))
+  (Info-goto-node (format "(%s)Top"
+			  (cond ((eq arg 16) mml2015-use)
+				((eq arg  4) 'emacs-mime)
+				((and (not (booleanp arg))
+				      (symbolp arg))
+				 arg)
+				(t
+				 'message)))))
 
 
 
Index: mml.el
diff -u gnus/lisp/mml.el:7.62 gnus/lisp/mml.el:7.63
--- mml.el:7.62	Sun Mar  2 18:35:16 2008
+++ mml.el	Wed Mar 19 17:02:22 2008
@@ -1017,13 +1017,13 @@
     (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)))
+(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 ""
@@ -1094,9 +1094,14 @@
     ["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))
+     :visible (equal mml2015-use 'pgg)
      ,@(if (featurep 'xemacs) '(t)
-	 '(:help "Display the PGG manual"))]))
+	 '(:help "Display the PGG manual"))]
+    ["EasyPG manual" (lambda () (interactive) (message-info mml2015-use))
+     :visible (equal mml2015-use 'epg)
+     ,@(if (featurep 'xemacs) '(t)
+	 '(:help "Display the EasyPG manual"))]))
 
 (defvar mml-mode nil
   "Minor mode for editing MML.")