* message.el (message-info): New function.

(message-mode-menu): Add it.
Update copyright.

* ChangeLog: Fix and update copyright.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 67d5ec4..59d5fc5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-16  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * message.el (message-info): New function.
+       (message-mode-menu): Add it.
+       Update copyright.
+
+       * ChangeLog: Fix and update copyright.
+
 2006-01-13  Romain Francoise  <romain@orebokech.com>
 
        * message.el (message-forward-subject-name-subject): Prefer the
@@ -7013,7 +7021,7 @@
 
 See ChangeLog.2 for earlier changes.
 
-    Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+    Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 

diff --git a/lisp/message.el b/lisp/message.el
index a38a9a8..84b8d65 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2252,6 +2252,17 @@ Point is left at the beginning of the narrowed-to region."
     (message-skip-to-next-address)
     (kill-region start (point))))
 
+
+(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."
+  (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"))))
+
 \f
 
 ;;;
@@ -2379,7 +2390,11 @@ Point is left at the beginning of the narrowed-to region."
         '(:help "Ask, then arrange to send message at that time"))]
     ["Kill Message" message-kill-buffer
      ,@(if (featurep 'xemacs) '(t)
-        '(:help "Delete this message without sending"))]))
+        '(:help "Delete this message without sending"))]
+    "----"
+    ["Message manual" message-info
+     ,@(if (featurep 'xemacs) '(t)
+        '(:help "Display the Message manual"))]))
 
 (easy-menu-define
   message-mode-field-menu message-mode-map ""