From d82cf70b7fe93c7928a59a3c6ae8d2680237f60d Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Tue, 8 Jan 2008 14:16:13 +0000 Subject: [PATCH] Merge from gnus--devo--0 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-985 --- doc/misc/ChangeLog | 8 ++++++++ doc/misc/gnus.texi | 30 +++++++--------------------- doc/misc/message.texi | 23 +++++++++++++++++++++- lisp/gnus/ChangeLog | 10 ++++++++++ lisp/gnus/gnus-bookmark.el | 4 ++-- lisp/gnus/gnus-group.el | 40 +++++++++++++++++++++++++++++++++++++- 6 files changed, 88 insertions(+), 27 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index e77cf42136..975b65dfc3 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,11 @@ +2008-01-05 Reiner Steib + + * message.texi (Mail Variables): Add some text from "(gnus)Posting + Server". Add `message-send-mail-with-mailclient'. + + * gnus.texi (Posting Server): Move some text to "(message)Mail + Variables" and add a reference here. + 2008-01-04 Michael Albinus * dbus.texi (Receiving Method Calls): New chapter. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 521ac05c6f..690c63e446 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -10,7 +10,7 @@ @copying Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -12139,28 +12139,12 @@ for posting. Finally, if you want to always post using the native select method, you can set this variable to @code{native}. -When sending mail, Message invokes @code{message-send-mail-function}. -The default function, @code{message-send-mail-with-sendmail}, pipes -your article to the @code{sendmail} binary for further queuing and -sending. When your local system is not configured for sending mail -using @code{sendmail}, and you have access to a remote @acronym{SMTP} -server, you can set @code{message-send-mail-function} to -@code{smtpmail-send-it} and make sure to setup the @code{smtpmail} -package correctly. An example: - -@lisp -(setq message-send-mail-function 'smtpmail-send-it - smtpmail-default-smtp-server "YOUR SMTP HOST") -@end lisp - -To the thing similar to this, there is -@code{message-smtpmail-send-it}. It is useful if your @acronym{ISP} -requires the @acronym{POP}-before-@acronym{SMTP} authentication. -@xref{POP before SMTP}. - -Other possible choices for @code{message-send-mail-function} includes -@code{message-send-mail-with-mh}, @code{message-send-mail-with-qmail}, -and @code{feedmail-send-it}. +@vindex message-send-mail-function +When sending mail, Message invokes the function specified by the +variable @code{message-send-mail-function}. Gnus tries to set it to a +value suitable for your system. +@xref{Mail Variables, ,Mail Variables,message,Message manual}, for more +information. @node POP before SMTP @section POP before SMTP diff --git a/doc/misc/message.texi b/doc/misc/message.texi index fab5aaf173..37c3384c1e 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -9,7 +9,7 @@ This file documents Message, the Emacs message composition mode. Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -2004, 2005, 2006, 2007 Free Software Foundation, Inc. +2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -1564,18 +1564,39 @@ when it doesn't lead to the user having to wait. @table @code @item message-send-mail-function @vindex message-send-mail-function +@findex message-send-mail-function @findex message-send-mail-with-sendmail @findex message-send-mail-with-mh @findex message-send-mail-with-qmail @findex message-smtpmail-send-it @findex smtpmail-send-it @findex feedmail-send-it +@findex message-send-mail-with-mailclient Function used to send the current buffer as mail. The default is @code{message-send-mail-with-sendmail}, or @code{smtpmail-send-it} according to the system. Other valid values include +@code{message-send-mail-with-mailclient}, @code{message-send-mail-with-mh}, @code{message-send-mail-with-qmail}, @code{message-smtpmail-send-it} and @code{feedmail-send-it}. +The function +@code{message-send-mail-with-sendmail} pipes your article to the +@code{sendmail} binary for further queuing and sending. When your local +system is not configured for sending mail using @code{sendmail}, and you +have access to a remote @acronym{SMTP} server, you can set +@code{message-send-mail-function} to @code{smtpmail-send-it} and make +sure to setup the @code{smtpmail} package correctly. An example: + +@lisp +(setq message-send-mail-function 'smtpmail-send-it + smtpmail-default-smtp-server "YOUR SMTP HOST") +@end lisp + +To the thing similar to this, there is +@code{message-smtpmail-send-it}. It is useful if your @acronym{ISP} +requires the @acronym{POP}-before-@acronym{SMTP} authentication. +@xref{POP before SMTP, , POP before SMTP, gnus, The Gnus Manual}. + @item message-mh-deletable-headers @vindex message-mh-deletable-headers Most versions of MH doesn't like being fed messages that contain the diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 7cf327570e..fee3716294 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,13 @@ +2008-01-08 Katsumi Yamaoka + + * gnus-bookmark.el (gnus-bookmark-mouse-available-p): Don't test for + display-color-p. Reported by Reiner Steib . + +2008-01-06 Reiner Steib + + * gnus-group.el (gnus-group-gmane-group-download-format): New variable. + (gnus-group-read-ephemeral-gmane-group): New command. + 2008-01-06 Dan Nicolaescu * gnus.el (gnus-use-long-file-name): Remove reference to xenix. diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el index 6341c8e48d..41f9dd0bac 100644 --- a/lisp/gnus/gnus-bookmark.el +++ b/lisp/gnus/gnus-bookmark.el @@ -174,8 +174,8 @@ So the cdr of each bookmark is an alist too.") (defmacro gnus-bookmark-mouse-available-p () "Return non-nil if a mouse is available." (if (featurep 'xemacs) - '(and (eq (device-class) 'color) (device-on-window-system-p)) - '(and (display-color-p) (display-mouse-p)))) + '(device-on-window-system-p) + '(display-mouse-p))) (defun gnus-bookmark-remove-properties (string) "Remove all text properties from STRING." diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 73d632591b..2be0b6e5c8 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, 2006, 2007 Free Software Foundation, Inc. +;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -2320,6 +2320,44 @@ Return the name of the group if selection was successful." (message "Quit reading the ephemeral group") nil))))) +(defvar gnus-group-gmane-group-download-format + "http://download.gmane.org/%s/%s/%s") +(autoload 'url-insert-file-contents "url-handlers") + +;; FIXME: Make gnus-group-gmane-group-download-format customizable. Add +;; documentation, menu, key bindings... + +(defun gnus-group-read-ephemeral-gmane-group (group start end) + "Read articles from Gmane group GROUP as an ephemeral group. +START and END specify the articles range. The articles are +downloaded via HTTP using the URL specified by +`gnus-group-gmane-group-download-format'." + ;; See for more information. + (interactive + (list + (gnus-group-completing-read "Gmane group: ") + (read-number "Start article number: ") + (read-number "End article number: "))) + (when (< (- end start) 0) + (error "Invalid range.")) + (when (> (- end start) + (min (or gnus-large-ephemeral-newsgroup 100) 100)) + (unless (y-or-n-p + (format "Large range (%s to %s), continue anyway? " + start end)) + (error "Range too large. Aborted."))) + (let ((tmpfile (make-temp-file "gmane.gnus-temp-group-"))) + (with-temp-file tmpfile + (url-insert-file-contents + (format gnus-group-gmane-group-download-format + group start end)) + (write-region (point-min) (point-max) tmpfile) + (gnus-group-read-ephemeral-group + "rs-gnus-read-gmane" + `(nndoc ,tmpfile + (nndoc-article-type guess)))) + (delete-file tmpfile))) + (defun gnus-group-jump-to-group (group &optional prompt) "Jump to newsgroup GROUP. -- 2.20.1