Doc fixes.

[gnu-emacs] / lisp / gnus.el

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 1804f0b0cc1ae4eeb02265e16206f41de63ae3f8..f50ca034de197e414b12f9638958daa01d2e9a22 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -55,12 +55,6 @@ See the documentation to that variable.")
   "Default default new newsgroups the first time Gnus is run.
 Should be set in paths.el, and shouldn't be touched by the user.")
 
-(defvar gnus-local-domain nil
-  "Local domain name without a host name.
-The DOMAINNAME environment variable is used instead if it is defined.
-If the `system-name' function returns the full Internet name, there is
-no need to set this variable.")
-
 (defvar gnus-local-organization nil
   "String with a description of what organization (if any) the user belongs to.
 The ORGANIZATION environment variable is used instead if it is defined.
@@ -2273,6 +2267,8 @@ Thank you for your help in stamping out bugs.
       (setq gnus-init-inhibit nil)
     (setq gnus-init-inhibit inhibit-next)
     (and gnus-init-file
+        ;; Don't load .gnus if -q option was used.
+        init-file-user
         (or (and (file-exists-p gnus-init-file)
                  ;; Don't try to load a directory.
                  (not (file-directory-p gnus-init-file)))