From: Eric Abrahamsen <eric@ericabrahamsen.net>
Date: Mon, 16 Oct 2017 18:30:05 +0000 (-0700)
Subject: Documentation and error-message edits re gnus-server-alist
X-Git-Tag: emacs-27.0.90~6243
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=94281c9a1cc0f756841fdc9b266657853df94a29;p=emacs.git

Documentation and error-message edits re gnus-server-alist

* lisp/gnus/gnus.el (gnus-server-alist): Expand docstring.
* lisp/gnus/gnus-srvr.el (gnus-server-kill-server,
  gnus-server-edit-server): Return error messages that tell the user
  what the actual problem is.
* doc/misc/gnus.texi (Server Commands): Note that not all servers are
  editable via the server buffer.
---

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 88e121a07b0..15c6230ad0b 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -13216,6 +13216,11 @@ Also @pxref{Formatting Variables}.
 @subsection Server Commands
 @cindex server commands
 
+The following keybinding are available in the server buffer.  Be aware
+that some of the commands will only work on servers that you've added
+through this interface (with @kbd{a}), not with servers you've defined
+in your init files.
+
 @table @kbd
 
 @item v
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index 82056cf1653..8a91973e388 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -452,7 +452,8 @@ The following commands are available:
     (if server (error "No such server: %s" server)
       (error "No server on the current line")))
   (unless (assoc server gnus-server-alist)
-    (error "Read-only server %s" server))
+    (error "Server %s must be deleted from your configuration files"
+	   server))
   (gnus-dribble-touch)
   (let ((buffer-read-only nil))
     (gnus-delete-line))
@@ -642,7 +643,8 @@ The following commands are available:
   (unless server
     (error "No server on current line"))
   (unless (assoc server gnus-server-alist)
-    (error "This server can't be edited"))
+    (error "Server %s must be edited in your configuration files"
+	   server))
   (let ((info (cdr (assoc server gnus-server-alist))))
     (gnus-close-server info)
     (gnus-edit-form
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 8c0846be9f7..ba4291a321a 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -2592,7 +2592,9 @@ a string, be sure to use a valid format, see RFC 2616."
 (defvar gnus-group-history nil)
 
 (defvar gnus-server-alist nil
-  "List of available servers.")
+  "Servers created by Gnus, or via the server buffer.
+Servers defined in the user's config files do not appear here.
+This variable is persisted in the user's .newsrc.eld file.")
 
 (defcustom gnus-cache-directory
   (nnheader-concat gnus-directory "cache/")