From bb3d57f547bdd5f29d36b7a506dec44ac8aea51e Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Wed, 19 Mar 2008 16:02:22 +0000 Subject: [PATCH] * message.el (message-info): Hanlde EasyPG manual. * mml.el (mml-menu): Add entry for EasyPG. --- lisp/ChangeLog | 6 ++++++ lisp/message.el | 16 +++++++++++----- lisp/mml.el | 23 ++++++++++++++--------- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 219d9cb7e..1b2af273f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2008-03-19 Reiner Steib + + * message.el (message-info): Hanlde EasyPG manual. + + * mml.el (mml-menu): Add entry for EasyPG. + 2008-03-18 Nils Ackermann (tiny change) * nnmh.el (nnmh-request-expire-articles): Prefer expiry-target group diff --git a/lisp/message.el b/lisp/message.el index 6e782ea7e..8bdd3d836 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -2478,12 +2478,18 @@ Point is left at the beginning of the narrowed-to region." (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))))) diff --git a/lisp/mml.el b/lisp/mml.el index 0a7aac29e..cf592acdf 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -1017,13 +1017,13 @@ If HANDLES is non-nil, use it instead reparsing the buffer." (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 @@ If HANDLES is non-nil, use it instead reparsing the buffer." ["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"))] + ["EasyPG manual" (lambda () (interactive) (message-info mml2015-use)) + :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.") -- 2.25.1