changeset 107471:2348ff8393d2

Synch with Gnus trunk ===================== 2010-03-22 Teodor Zlatanov <tzz@lifelogs.com> * gnus/gnus-setup.ast: Add finish links to the top nodes. * gnus/news-server.ast: Add some trivial validation.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 23 Mar 2010 07:32:05 +0000
parents 008c1c06812b (current diff) a213d79a9aae (diff)
children 53123bbde505 f7e5232d459a
files
diffstat 3 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/etc/ChangeLog	Tue Mar 23 09:16:57 2010 +0200
+++ b/etc/ChangeLog	Tue Mar 23 07:32:05 2010 +0000
@@ -1,3 +1,9 @@
+2010-03-22  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnus/gnus-setup.ast: Add finish links to the top nodes.
+
+	* gnus/news-server.ast: Add some trivial validation.
+
 2010-03-13  Michael Albinus  <michael.albinus@gmx.de>
 
 	* NEWS: Add secrets.el.
--- a/etc/gnus/gnus-setup.ast	Tue Mar 23 09:16:57 2010 +0200
+++ b/etc/gnus/gnus-setup.ast	Tue Mar 23 07:32:05 2010 +0000
@@ -33,6 +33,8 @@
 
 @end text
 
+@next 'finish
+
 @node Setting up a NNTP server
 
 @text
@@ -40,6 +42,8 @@
 Run M-x assistant and use the news-server.ast file as input.
 @end text
 
+@next 'finish
+
 
 @c Local variables:
 @c mode: texinfo
--- a/etc/gnus/news-server.ast	Tue Mar 23 09:16:57 2010 +0200
+++ b/etc/gnus/news-server.ast	Tue Mar 23 07:32:05 2010 +0000
@@ -2,9 +2,9 @@
 
 
 @node Setting up the news server name and port number
-@variable server :string (gnus-getenv-nntpserver)
+@variable server :string (or (gnus-getenv-nntpserver) "your-server-here")
 @variable port :number 119
-@validate (assistant-validate-connect-to-server server port)
+@validate (or (assistant-validate-connect-to-server server port) (y-or-n-p "Do you want to use the server anyway, although you can't confirm it's valid?"))
 @result gnus-select-method (list 'nntp server (list 'nntp-server port))
 @text
 Usenet news is usually read from your Internet service prodider's news
@@ -14,10 +14,10 @@
 
 Server name: @variable{server}
 Port number: @variable{port}
+
 @end text
 @next t "User name and password"
 
-
 @node User name and password
 @type interstitial
 @next