Mercurial > emacs
changeset 3612:d701e7af5ba5
* gnus.el (gnus-start-news-server): If no server has been
specificed, but gnus-nntp-service is nil, don't ask for a server
name; use the local host.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Thu, 10 Jun 1993 11:46:43 +0000 |
| parents | 2250b4880589 |
| children | f37a9c897699 |
| files | lisp/=gnus.el |
| diffstat | 1 files changed, 14 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/=gnus.el Thu Jun 10 11:39:44 1993 +0000 +++ b/lisp/=gnus.el Thu Jun 10 11:46:43 1993 +0000 @@ -1,6 +1,6 @@ ;;; GNUS: an NNTP-based News Reader for GNU Emacs ;; Copyright (C) 1987, 1988, 1989, 1990, 1993 Free Software Foundation, Inc. -;; $Header: /gd/gnu/emacs/19.0/lisp/RCS/gnus.el,v 1.19 1993/06/09 11:53:26 jimb Exp jimb $ +;; $Header: /gd/gnu/emacs/19.0/lisp/RCS/gnus.el,v 1.20 1993/06/10 10:40:16 jimb Exp jimb $ ;; This file is part of GNU Emacs. @@ -5356,15 +5356,19 @@ ;; Open NNTP server. (if (or confirm (null gnus-nntp-server)) - (if (and (boundp 'gnus-secondary-servers) gnus-secondary-servers) - ;; Read server name with completion. - (setq gnus-nntp-server - (completing-read "NNTP server: " - (cons (list gnus-nntp-server) - gnus-secondary-servers) - nil nil gnus-nntp-server)) - (setq gnus-nntp-server - (read-string "NNTP server: " gnus-nntp-server)))) + ;; If someone has set the service to nil, then this should always + ;; be the local host. + (if gnus-nntp-service + (if (and (boundp 'gnus-secondary-servers) gnus-secondary-servers) + ;; Read server name with completion. + (setq gnus-nntp-server + (completing-read "NNTP server: " + (cons (list gnus-nntp-server) + gnus-secondary-servers) + nil nil gnus-nntp-server)) + (setq gnus-nntp-server + (read-string "NNTP server: " gnus-nntp-server))) + (setq gnus-nntp-server ""))) ;; If no server name is given, local host is assumed. (if (or (string-equal gnus-nntp-server "") (string-equal gnus-nntp-server "::")) ;RMS preference.