*** empty log message ***

[gnus] / lisp / gnus-start.el

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 0061d01..57a9dde 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -546,7 +546,7 @@ prompt the user for the name of an NNTP server to use."
     (gnus-read-init-file)
     (setq gnus-slave slave)
 
-    (when (string-match "xemacs" (emacs-version))
+    (when (string-match "XEmacs" (emacs-version))
       (gnus-splash))
 
     (let ((level (and (numberp arg) (> arg 0) arg))
@@ -767,6 +767,10 @@ If LEVEL is non-nil, the news will be set up at level LEVEL."
               (not dont-connect))
       (gnus-nocem-scan-groups))
 
+    ;; Read any slave files.
+    (unless gnus-slave
+      (gnus-master-read-slave-newsrc))
+
     ;; Find the number of unread articles in each non-dead group.
     (let ((gnus-read-active-file (and (not level) gnus-read-active-file)))
       (gnus-get-unread-articles level))
@@ -1353,7 +1357,7 @@ newsgroup."
           t)
         (condition-case ()
             (gnus-request-group group dont-check method)
-                                       ;   (error nil)
+          (error nil)
           (quit nil))
         (gnus-set-active group (setq active (gnus-parse-active)))
         ;; Return the new active info.
@@ -1421,7 +1425,8 @@ newsgroup."
             (setq gnus-killed-list
                   (cons group gnus-killed-list))
             (gnus-sethash group group gnus-killed-hashtb))))))
-   gnus-active-hashtb))
+   gnus-active-hashtb)
+  (gnus-dribble-enter ""))
 
 ;; Get the active file(s) from the backend(s).
 (defun gnus-read-active-file ()
@@ -1671,7 +1676,7 @@ If FORCE is non-nil, the .newsrc file is read."
          ;; the `gnus-newsrc-hashtb' has been created.  While reading
          ;; the .newsrc file, Gnus will only use the information it
          ;; can find there for changing the data already read -
-         ;; ie. reading the .newsrc file will not trash the data
+         ;; i. e., reading the .newsrc file will not trash the data
          ;; already read (except for read articles).
          (save-excursion
            (gnus-message 5 "Reading %s..." newsrc-file)
@@ -1680,10 +1685,6 @@ If FORCE is non-nil, the .newsrc file is read."
            (gnus-newsrc-to-gnus-format)
            (kill-buffer (current-buffer))
            (gnus-message 5 "Reading %s...done" newsrc-file)))
-
-      ;; Read any slave files.
-      (unless gnus-slave
-       (gnus-master-read-slave-newsrc))
       
       ;; Convert old to new.
       (gnus-convert-old-newsrc))))
@@ -1967,7 +1968,7 @@ If FORCE is non-nil, the .newsrc file is read."
            entry mentry)
        (while rc
          (or (null (nth 4 (car rc)))   ; It's a native group.
-             (assoc (caar rc) newsrc) ; It's already in the alist.
+             (assoc (caar rc) newsrc)  ; It's already in the alist.
              (if (setq entry (assoc (caar prev) newsrc))
                  (setcdr (setq mentry (memq entry newsrc))
                          (cons (car rc) (cdr mentry)))
@@ -2226,7 +2227,7 @@ If FORCE is non-nil, the .newsrc file is read."
                (error
                 (gnus-error 3.2 "Possible error in %s" file)
                 nil))
-             (or gnus-slave ; Slaves shouldn't delete these files.
+             (or gnus-slave            ; Slaves shouldn't delete these files.
                  (condition-case ()
                      (delete-file file)
                    (error nil))))
@@ -2329,7 +2330,11 @@ If FORCE is non-nil, the .newsrc file is read."
 (defun gnus-set-default-directory ()
   "Set the default directory in the current buffer to `gnus-default-directory'.
 If this variable is nil, don't do anything."
-  (setq default-directory (or gnus-default-directory default-directory)))
+  (setq default-directory 
+       (if (and gnus-default-directory
+                (file-exists-p gnus-default-directory))
+           (file-name-as-directory (expand-file-name gnus-default-directory))
+         default-directory)))
 
 (provide 'gnus-start)