diff options
| author | Jim Blandy <jimb@redhat.com> | 1993-06-10 11:46:43 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@redhat.com> | 1993-06-10 11:46:43 +0000 |
| commit | 1c595d45c4f707f324e80a593cb7ca4b4391cfed (patch) | |
| tree | b7416c314e549103e682b2f1c16a227ca0213122 | |
| parent | 92b281339af833561dad68289cd2209a379b24da (diff) | |
| download | emacs-1c595d45c4f707f324e80a593cb7ca4b4391cfed.tar.gz | |
* 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.
| -rw-r--r-- | lisp/gnus.el | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/lisp/gnus.el b/lisp/gnus.el index f9f5c663214..0659418df7b 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -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 @@ Run gnus-open-server-hook just before opening news server." ;; 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. |