Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-702

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 185-186)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

2006-01-16  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/nnrss.el: Update copyright.
   (nnrss-opml-import): Query whether to subscribe to each entry.

   * lisp/gnus/gnus-art.el:
   * lisp/gnus/gnus-cus.el:
   * lisp/gnus/gnus-group.el:
   * lisp/gnus/gnus-start.el:
   * lisp/gnus/gnus-sum.el:
   * lisp/gnus/mm-uu.el:
   * lisp/gnus/mm-view.el: Update copyright.

2006-01-16  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/message.el (message-info): New function.
   (message-mode-menu): Add it.
   Update copyright.

   * lisp/gnus/ChangeLog: Fix and update copyright.

2006-01-16  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi: Update copyright.

12 files changed, 73 insertions, 25 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b4c02fa2b3b..6e0405c24eb 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,26 @@
 2006-01-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+        * nnrss.el: Update copyright.
+        (nnrss-opml-import): Query whether to subscribe to each entry.
+
+        * gnus-art.el:
+        * gnus-cus.el:
+        * gnus-group.el:
+        * gnus-start.el:
+        * gnus-sum.el:
+        * mm-uu.el:
+        * mm-view.el: Update copyright.
+
+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-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
         * mm-uu.el (mm-uu-text-plain-type): New variable.
         (mm-uu-pgp-signed-extract-1): Use it.
         (mm-uu-pgp-encrypted-extract-1): Use it.
@@ -53,12 +74,6 @@
         RFC822 style.  Suggested by Mark Plaksin <happy@mcplaksin.org>.
         (nnrss-check-group): Use it.
 
-2006-01-03  Rodrigo Ventura <yoda@isr.ist.utl.pt>  (tiny change)
-
-        * gnus-xmas.el (gnus-xmas-group-startup-message): Typo
-        gnus-splash-face -> gnus-splash.  Fixes starting from a TTY in
-        XEmacs.
-
 2006-01-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-sum.el (gnus-summary-work-articles): Remove useless `min'.
@@ -3274,7 +3289,7 @@
 
 See ChangeLog.2 for earlier changes.
 
-    Copyright (C) 2000, 2001, 2002 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/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 2b5cc46d936..92a4f09ded3 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1,7 +1,7 @@
 ;;; gnus-art.el --- article mode commands for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-cus.el b/lisp/gnus/gnus-cus.el
index df09fd43e48..fdce8d1b665 100644
--- a/lisp/gnus/gnus-cus.el
+++ b/lisp/gnus/gnus-cus.el
@@ -1,7 +1,7 @@
 ;;; gnus-cus.el --- customization commands for Gnus
 
 ;; Copyright (C) 1996, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 4246dbe6d86..933c3762ed9 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1,7 +1,7 @@
 ;;; gnus-group.el --- group mode commands for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index a7ae3eb95fe..465ce0627b7 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1,7 +1,7 @@
 ;;; gnus-start.el --- startup functions for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index cd8d3c03d79..b2a70b8fcb6 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1,7 +1,7 @@
 ;;; gnus-sum.el --- summary mode commands for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index ec420ea4b2e..797d2233fe5 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1,7 +1,7 @@
 ;;; message.el --- composing mail and news messages
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, news
@@ -2185,6 +2185,15 @@ Point is left at the beginning of the narrowed-to region."
              (1+ max)))))
       (message-sort-headers-1))))
 
+(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"))))
 
 
 
@@ -2312,7 +2321,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 ""
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index f3328c1f789..312c3dd8542 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -1,7 +1,7 @@
 ;;; mm-uu.el --- Return uu stuff as mm handles
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: postscript uudecode binhex shar forward gnatsweb pgp
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 882937c7cb2..645e960b535 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -1,7 +1,7 @@
 ;;; mm-view.el --- functions for viewing MIME objects
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index 18a54d05d0d..318560179f5 100644
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@ -1,6 +1,7 @@
 ;;; nnrss.el --- interfacing with RSS
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: RSS
@@ -755,14 +756,29 @@ which RSS 2.0 allows."
   "OPML subscriptions import.
 Read the file and attempt to subscribe to each Feed in the file."
   (interactive "fImport file: ")
-  (mapcar
-   (lambda (node) (gnus-group-make-rss-group
-                   (cdr (assq 'xmlUrl (cadr node)))))
+  (mapc
+   (lambda (node)
+     (let ((xmlurl (cdr (assq 'xmlUrl (cadr node)))))
+       (when (and xmlurl
+                  (not (string-match "\\`[\t ]*\\'" xmlurl))
+                  (prog1
+                      (y-or-n-p (format "Subscribe to %s " xmlurl))
+                    (message "")))
+         (condition-case err
+             (progn
+               (gnus-group-make-rss-group xmlurl)
+               (forward-line 1))
+           (error
+            (message
+             "Failed to subscribe to %s (%s); type any key to continue: "
+             xmlurl
+             (error-message-string err))
+            (let ((echo-keystrokes 0))
+              (read-char)))))))
    (nnrss-find-el 'outline
-                  (progn
-                    (find-file opml-file)
-                    (xml-parse-region (point-min)
-                                      (point-max))))))
+                  (mm-with-multibyte-buffer
+                    (insert-file-contents opml-file)
+                    (xml-parse-region (point-min) (point-max))))))
 
 (defun nnrss-opml-export ()
   "OPML subscription export.
diff --git a/man/ChangeLog b/man/ChangeLog
index 887a7661473..eace76aae1a 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi: Update copyright.
+
 2006-01-16  Juri Linkov  <juri@jurta.org>
 
         * display.texi (Standard Faces): Add `mode-line-buffer-id'.
diff --git a/man/gnus.texi b/man/gnus.texi
index e28537329ba..8fe7355a4c8 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -8,7 +8,7 @@
 
 @copying
 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document