Mercurial > emacs
changeset 68230:6c7c654eb3c7
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.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 17 Jan 2006 02:39:39 +0000 |
| parents | d045937b151a |
| children | 21395f2accec |
| files | lisp/gnus/ChangeLog 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/message.el lisp/gnus/mm-uu.el lisp/gnus/mm-view.el lisp/gnus/nnrss.el man/ChangeLog man/gnus.texi |
| diffstat | 12 files changed, 73 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Tue Jan 17 02:11:40 2006 +0000 +++ b/lisp/gnus/ChangeLog Tue Jan 17 02:39:39 2006 +0000 @@ -1,3 +1,24 @@ +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. @@ -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.
--- a/lisp/gnus/gnus-art.el Tue Jan 17 02:11:40 2006 +0000 +++ b/lisp/gnus/gnus-art.el Tue Jan 17 02:39:39 2006 +0000 @@ -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
--- a/lisp/gnus/gnus-cus.el Tue Jan 17 02:11:40 2006 +0000 +++ b/lisp/gnus/gnus-cus.el Tue Jan 17 02:39:39 2006 +0000 @@ -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
--- a/lisp/gnus/gnus-group.el Tue Jan 17 02:11:40 2006 +0000 +++ b/lisp/gnus/gnus-group.el Tue Jan 17 02:39:39 2006 +0000 @@ -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
--- a/lisp/gnus/gnus-start.el Tue Jan 17 02:11:40 2006 +0000 +++ b/lisp/gnus/gnus-start.el Tue Jan 17 02:39:39 2006 +0000 @@ -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
--- a/lisp/gnus/gnus-sum.el Tue Jan 17 02:11:40 2006 +0000 +++ b/lisp/gnus/gnus-sum.el Tue Jan 17 02:39:39 2006 +0000 @@ -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
--- a/lisp/gnus/message.el Tue Jan 17 02:11:40 2006 +0000 +++ b/lisp/gnus/message.el Tue Jan 17 02:39:39 2006 +0000 @@ -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 @@ (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 @@ '(: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 ""
--- a/lisp/gnus/mm-uu.el Tue Jan 17 02:11:40 2006 +0000 +++ b/lisp/gnus/mm-uu.el Tue Jan 17 02:39:39 2006 +0000 @@ -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
--- a/lisp/gnus/mm-view.el Tue Jan 17 02:11:40 2006 +0000 +++ b/lisp/gnus/mm-view.el Tue Jan 17 02:39:39 2006 +0000 @@ -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.
--- a/lisp/gnus/nnrss.el Tue Jan 17 02:11:40 2006 +0000 +++ b/lisp/gnus/nnrss.el Tue Jan 17 02:39:39 2006 +0000 @@ -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 @@ "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.
--- a/man/ChangeLog Tue Jan 17 02:11:40 2006 +0000 +++ b/man/ChangeLog Tue Jan 17 02:39:39 2006 +0000 @@ -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'.
--- a/man/gnus.texi Tue Jan 17 02:11:40 2006 +0000 +++ b/man/gnus.texi Tue Jan 17 02:39:39 2006 +0000 @@ -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