*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e54ac6..8db7418 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,23 @@
-Tue Sep 19 17:32:14 1995  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+Tue Sep 26 00:42:54 1995  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
 
-       * gnus.el (gnus-find-new-newsgroups): Would not save .newsrc if
-               all new group were made into zombies.
+       * gnus.el: 5.0.5 & 5.0.6 are released.
 
-       * gnus-ems.el (gnus-set-text-properties-xemacs): Would bug out on
-               strings that happened to be buffer names.
+Sat Sep 23 20:00:35 1995  Lars Ingebrigtsen  <lars@eyesore.no>
+
+       * gnus.el (gnus-summary-insert-line): Don't lose process marks. 
+
+       * auc-menu.el: Removed file.
+
+       * gnus.el (gnus-no-server): Would have permanent effects.
+
+       * gnus-kill.el (gnus-execute): Would bug out on pseudo-articles.
+
+       * gnus.el (gnus-article-display-x-face): Would bug out on articles
+       with no From header.
+       (gnus-summary-sort): Async would not work after sorting.
+
+       * gnus-cache.el (gnus-cache-possibly-enter-article): Would enter
+       reffed articles.
 
 Sat Sep 16 10:24:02 1995  Lars Magne Ingebrigtsen  <larsi@surt.ifi.uio.no>
 

diff --git a/lisp/custom.el b/lisp/custom.el
index 08d912c..c4e7a4a 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -264,7 +264,8 @@ If called interactively, prompts for a face and face attributes."
 ;; Put it in the Help menu, if possible.
 (if (string-match "XEmacs" emacs-version)
     ;; XEmacs (disabled because it doesn't work)
-    (add-menu-item '("Help") "Customize..." 'customize nil)
+    (and current-menubar
+        (add-menu-item '("Help") "Customize..." 'customize nil))
   ;; Emacs 19.28 and earlier
   (global-set-key [ menu-bar help customize ]
                  '("Customize..." . customize))

diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index 8358d81..1d99860 100644 (file)
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -120,6 +120,7 @@
   (let ((number (mail-header-number headers))
        file dir)
     (if (or (not (vectorp headers))    ; This might be a dummy article.
+           (< number 0)                ; Reffed article from other group.
            (not (gnus-cache-member-of-class
                  gnus-cache-enter-articles ticked dormant unread))
            (file-exists-p (setq file (gnus-cache-file-name group article))))

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 6847318..7a2cdb2 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -25,7 +25,6 @@
 ;;; Code:
 
 (defvar gnus-mouse-2 [mouse-2])
-(defvar gnus-easymenu 'easymenu)
 (defvar gnus-group-mode-hook ())
 (defvar gnus-summary-mode-hook ())
 (defvar gnus-article-mode-hook ())
@@ -72,7 +71,7 @@
 (defun gnus-set-text-properties-xemacs (start end props &optional buffer)
   "You should NEVER use this function.  It is ideologically blasphemous.
 It is provided only to ease porting of broken FSF Emacs programs."
-  (if (stringp buffer)
+  (if (and (stringp buffer) (not (setq buffer (get-buffer buffer))))
       nil
     (map-extents (lambda (extent ignored)
                   (remove-text-properties 
@@ -134,7 +133,6 @@ pounce directly on the real variables themselves."))
       ;; XEmacs definitions.
 
       (setq gnus-mouse-2 [button2])
-      (setq gnus-easymenu 'auc-menu)
 
       (or (memq 'underline (list-faces))
          (and (fboundp 'make-face)

diff --git a/lisp/gnus-kill.el b/lisp/gnus-kill.el
index c5ff6ee..23d1dfe 100644 (file)
--- a/lisp/gnus-kill.el
+++ b/lisp/gnus-kill.el
@@ -604,7 +604,7 @@ If optional 2nd argument IGNORE-MARKED is non-nil, articles which are
 marked as read or ticked are ignored."
   (save-excursion
     (let ((killed-no 0)
-         function article)
+         function article header)
       (if (or (null field) (string-equal field ""))
          (setq function nil)
        ;; Get access function of header filed.
@@ -624,8 +624,8 @@ marked as read or ticked are ignored."
                        backward (not ignore-marked))))
        (and (or (null gnus-newsgroup-kill-headers)
                 (memq article gnus-newsgroup-kill-headers))
-            (gnus-execute-1 function regexp form 
-                            (gnus-get-header-by-number article))
+            (vectorp (setq header (gnus-get-header-by-number article)))
+            (gnus-execute-1 function regexp form header)
             (setq killed-no (1+ killed-no))))
       killed-no)))
 

diff --git a/lisp/gnus-vis.el b/lisp/gnus-vis.el
index 610dd27..270d8bd 100644 (file)
--- a/lisp/gnus-vis.el
+++ b/lisp/gnus-vis.el
@@ -27,7 +27,7 @@
 
 (require 'gnus)
 (require 'gnus-ems)
-(require gnus-easymenu)
+(require 'easymenu)
 (require 'custom)
 
 (defvar gnus-group-menu-hook nil

diff --git a/lisp/gnus.el b/lisp/gnus.el
index bb8ac78..75ba331 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1349,7 +1349,7 @@ variable (string, integer, character, etc).")
   "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)"
   "The mail address of the Gnus maintainers.")
 
-(defconst gnus-version "Gnus v5.0.5"
+(defconst gnus-version "Gnus v5.0.6"
   "Version number for this version of Gnus.")
 
 (defvar gnus-info-nodes
@@ -3236,6 +3236,8 @@ The following commands are available:
     (or level gnus-group-default-list-level gnus-level-subscribed))))
   
 
+(defvar gnus-tmp-prev-perm nil)
+
 ;;;###autoload
 (defun gnus-no-server (&optional arg)
   "Read network news.
@@ -3245,8 +3247,12 @@ If ARG is non-nil and not a positive number, Gnus will
 prompt the user for the name of an NNTP server to use.
 As opposed to `gnus', this command will not connect to the local server."
   (interactive "P")
-  (setq gnus-group-use-permanent-levels t)
-  (gnus (or arg (1- gnus-level-default-subscribed)) t))
+  (let ((perm
+        (cons gnus-group-use-permanent-levels gnus-group-default-list-level)))
+    (setq gnus-tmp-prev-perm nil)
+    (setq gnus-group-use-permanent-levels t)
+    (gnus (or arg (1- gnus-level-default-subscribed)) t)
+    (setq gnus-tmp-prev-perm perm)))
 
 ;;;###autoload
 (defun gnus (&optional arg dont-connect)
@@ -3263,6 +3269,11 @@ prompt the user for the name of an NNTP server to use."
     (gnus-clear-system)
 
     (nnheader-init-server-buffer)
+    ;; We do this if `gnus-no-server' has been run.
+    (if gnus-tmp-prev-perm 
+       (setq gnus-group-use-permanent-levels (car gnus-tmp-prev-perm)
+             gnus-group-default-list-level (cdr gnus-tmp-prev-perm)
+             gnus-tmp-prev-perm nil))
     (gnus-read-init-file)
 
     (gnus-group-setup-buffer)
@@ -5324,7 +5335,7 @@ buffer.
   (define-key gnus-summary-mode-map 
     "\C-c\C-s\C-s" 'gnus-summary-sort-by-subject)
   (define-key gnus-summary-mode-map "\C-c\C-s\C-d" 'gnus-summary-sort-by-date)
-  (define-key gnus-summary-mode-map "\C-c\C-s\C-v" 'gnus-summary-sort-by-score)
+  (define-key gnus-summary-mode-map "\C-c\C-s\C-i" 'gnus-summary-sort-by-score)
   (define-key gnus-summary-mode-map "=" 'gnus-summary-expand-window)
   (define-key gnus-summary-mode-map 
     "\C-x\C-s" 'gnus-summary-reselect-current-group)
@@ -5792,7 +5803,7 @@ article number."
 
 (defun gnus-summary-insert-line 
   (sformat header level current unread replied expirable subject-or-nil
-          &optional dummy score)
+          &optional dummy score process)
   (or sformat (setq sformat gnus-summary-line-format-spec))
   (let* ((indentation (aref gnus-thread-indent-array level))
         (lines (mail-header-lines header))
@@ -5803,7 +5814,9 @@ article number."
                      gnus-summary-zcore-fuzz)) ? 
            (if (< score gnus-summary-default-score)
                gnus-score-below-mark gnus-score-over-mark)))
-        (replied (if replied gnus-replied-mark ? ))
+        (replied (cond (process gnus-process-mark)
+                       (replied gnus-replied-mark)
+                       (t gnus-unread-mark)))
         (from (mail-header-from header))
         (name (cond 
                ((string-match "(.+)" from)
@@ -6574,7 +6587,8 @@ or a straight list of headers."
                 (t gnus-summary-same-subject))
                (and (eq gnus-summary-make-false-root 'adopt)
                     (memq number gnus-tmp-gathered))
-               (cdr (assq number gnus-newsgroup-scored)))
+               (cdr (assq number gnus-newsgroup-scored))
+               (memq number gnus-newsgroup-processable))
 
               (setq gnus-tmp-prev-subject subject)))))
 
@@ -6627,7 +6641,8 @@ or a straight list of headers."
         (memq number gnus-newsgroup-replied)
         (memq number gnus-newsgroup-expirable)
         (mail-header-subject header) nil
-        (cdr (assq number gnus-newsgroup-scored))))))))
+        (cdr (assq number gnus-newsgroup-scored))
+        (memq number gnus-newsgroup-processable)))))))
 
 (defun gnus-select-newsgroup (group &optional read-all)
   "Select newsgroup GROUP.
@@ -8360,7 +8375,9 @@ Return nil if there are no unread articles."
                        article (gnus-summary-article-number)))
             t)
           (gnus-summary-search-subject nil t))))
-    (gnus-summary-goto-article article)
+    (if (not article)
+       (error "No unread articles")
+      (gnus-summary-goto-article article))
     (gnus-summary-position-cursor)))
 
 (defun gnus-summary-goto-article (article &optional all-headers)
@@ -10276,7 +10293,8 @@ Argument REVERSE means reverse order."
                (if (and gnus-asynchronous-article-function
                         (fboundp gnus-asynchronous-article-function))
                    (funcall gnus-asynchronous-article-function
-                            gnus-newsgroup-threads)))))))))
+                            gnus-newsgroup-threads)
+                 gnus-newsgroup-threads))))))))
 
   
 (defun gnus-sortable-date (date)
@@ -11094,18 +11112,20 @@ Provided for backwards compatability."
   (save-excursion
     (set-buffer gnus-article-buffer)
     (let ((inhibit-point-motion-hooks t)
-         (case-fold-search nil))
+         (case-fold-search nil)
+         from)
       (save-restriction
        (goto-char (point-min))
        (search-forward "\n\n")
        (narrow-to-region (point-min) (point))
        (goto-char (point-min))
+       (setq from (mail-fetch-field "from"))
        (if (not (and gnus-article-x-face-command
                      (or force
                          (not gnus-article-x-face-too-ugly)
-                         (and gnus-article-x-face-too-ugly
+                         (and gnus-article-x-face-too-ugly from
                               (not (string-match gnus-article-x-face-too-ugly
-                                                 (mail-fetch-field "from")))))
+                                                 from))))
                      (progn
                        (goto-char (point-min))
                        (re-search-forward "^X-Face: " nil t))))
@@ -12065,10 +12085,8 @@ The `-n' option line from .newsrc is respected."
              (gnus-subscribe-hierarchical-interactive new-newsgroups))
          ;; Suggested by Per Abrahamsen <amanda@iesd.auc.dk>.
          (if (> groups 0)
-             (progn
-               (gnus-dribble-enter "")
-               (gnus-message 6 "%d new newsgroup%s arrived." 
-                             groups (if (> groups 1) "s have" " has")))
+             (gnus-message 6 "%d new newsgroup%s arrived." 
+                           groups (if (> groups 1) "s have" " has"))
            (gnus-message 6 "No new newsgroups."))))))
 
 (defun gnus-matches-options-n (group)
@@ -12151,10 +12169,8 @@ The `-n' option line from .newsrc is respected."
        (gnus-subscribe-hierarchical-interactive new-newsgroups))
     ;; Suggested by Per Abrahamsen <amanda@iesd.auc.dk>.
     (if (> groups 0)
-       (progn
-         (gnus-dribble-enter "")
-         (gnus-message 6 "%d new newsgroup%s arrived." 
-                       groups (if (> groups 1) "s have" " has"))))
+       (gnus-message 6 "%d new newsgroup%s arrived." 
+                     groups (if (> groups 1) "s have" " has")))
     got-new))
 
 (defun gnus-check-first-time-used ()

diff --git a/lisp/nnvirtual.el b/lisp/nnvirtual.el
index cc2e211..613b55f 100644 (file)
--- a/lisp/nnvirtual.el
+++ b/lisp/nnvirtual.el
@@ -85,6 +85,7 @@
                                 (gnus-find-method-for-group group))
                           (and (or (gnus-server-opened group-method)
                                    (gnus-open-server group-method))
+                               (gnus-request-group group t)
                                (gnus-retrieve-headers articles group)))))
              (save-excursion
                (set-buffer nntp-server-buffer)

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 922829c..38ffe21 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -5253,8 +5253,8 @@ Sort by subject (@code{gnus-summary-sort-by-subject}).
 @kindex C-c C-s C-d (Summary)
 @findex gnus-summary-sort-by-date
 Sort by date (@code{gnus-summary-sort-by-date}).
-@item C-c C-s C-v
-@kindex C-c C-s C-v (Summary)
+@item C-c C-s C-i
+@kindex C-c C-s C-i (Summary)
 @findex gnus-summary-sort-by-score
 Sort by score (@code{gnus-summary-sort-by-score}).
 @end table
@@ -5998,7 +5998,7 @@ forms into this file, which means that you can use kill files as some
 sort of primitive hook function to be run on group entry, even though
 that isn't a very good idea.
 
-Normal kill files look like this:
+XCNormal kill files look like this:
 
 @lisp
 (gnus-kill "From" "Lars Ingebrigtsen")