*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ccf144..8dcbec1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,42 @@
+Wed Apr 19 05:51:27 1995  Lars Magne Ingebrigtsen  <larsi@holmenkollen.ifi.uio.no>
+
+       * nntp.el (nntp-request-group): Error in regexp when using LIST
+       ACTIVE. 
+
+       * gnus.el (gnus-parse-newsrc-body): Don't reset levels.
+       (gnus-group-always-list-unread): New variable.
+
+       * gnus-uu.el (gnus-uu-save-files): Ask user whether to overwrite
+       existing files.
+
+       * nnmbox.el (nnmbox-request-expire-articles): Fix from Ilja Weis.
+
+Tue Apr 18 02:45:28 1995  Christian Limpach  <chris@nice.ch>
+
+       * gnus.el (gnus-point-at-bol): new subst
+       (gnus-point-at-eol): new subst
+       * gnus.el: changed all save-excursions to find point at the
+       beginning or end of a line to use either gnus-point-at-bol or
+       gnus-point-at-eol.
+
+Wed Apr 19 03:59:04 1995  Lars Magne Ingebrigtsen  <larsi@holmenkollen.ifi.uio.no>
+
+       * gnus-visual.el (gnus-visual-highlight-selected-summary):
+       Highlight correctly with no mouse-face present.
+
+       * gnus.el (gnus-current-score-file-nondirectory): New function.
+       (gnus-mode-non-string-length): New semantics from Sudish Joseph. 
+
+       * gnus-uu.el: Included all of Eric Selbergs PostScript functions. 
+
+       * gnus.el (gnus-summary-mode-line-format-alist): Missing ?s in g
+       spec. 
+       (gnus-summary-read-group): Go to the next group if the group can't
+       be selected. 
+       (gnus-update-summary-mark-positions): Don't bug out on threads. 
+       (gnus-summary-copy-article): Accept the prefix as the default
+       group. 
+
 Wed Apr 19 03:28:37 1995  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * gnus.el: Major changes in server handling; new mode; and lots of

diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index deaf2c3..4fa1fd9 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -243,6 +243,9 @@ so I simply dropped them.")
 (defvar gnus-uu-shar-file-name nil)
 (defconst gnus-uu-shar-name-marker "begin [0-7][0-7][0-7][ \t]+\\(\\(\\w\\|\\.\\)*\\b\\)")
 
+(defconst gnus-uu-postscript-begin-string "^%!PS-")
+(defconst gnus-uu-postscript-end-string "^%%EOF$")
+
 (defvar gnus-uu-file-name nil)
 (defconst gnus-uu-uudecode-process nil)
 
@@ -449,6 +452,40 @@ so I simply dropped them.")
        (forward-line 1))))
   (gnus-summary-position-cursor))
 
+;; All PostScript functions written by Erik Selberg <speed@cs.washington.edu>. 
+
+(defun gnus-uu-decode-postscript (n)
+  "Gets postscript of the current article."
+  (interactive "P")
+  (gnus-uu-decode-with-method 'gnus-uu-decode-postscript-article n))
+
+(defun gnus-uu-decode-postscript-view (n)
+  "Gets and views the current article."
+  (interactive "P")
+  (let ((gnus-view-pseudos (or gnus-view-pseudos 'automatic)))
+    (gnus-uu-decode-postscript n)))
+
+(defun gnus-uu-decode-postscript-and-save (n dir)
+  "Extracts postscript and saves the current article."
+  (interactive
+   (list current-prefix-arg
+        (read-file-name "Where do you want to save the file(s)? "
+                        gnus-uu-default-dir
+                        gnus-uu-default-dir t)))
+  (gnus-uu-decode-with-method 'gnus-uu-decode-postscript-article n dir))
+
+
+(defun gnus-uu-decode-postscript-and-save-view (n dir)
+  "Decodes, views and saves the resulting file."
+  (interactive
+   (list current-prefix-arg
+        (read-file-name "Where do you want to save the file(s)? "
+                        gnus-uu-default-dir
+                        gnus-uu-default-dir t)))
+  (let ((gnus-view-pseudos (or gnus-view-pseudos 'automatic)))
+    (gnus-uu-decode-postscript-and-save n dir)))
+
+
 ;; Internal functions.
 
 (defun gnus-uu-decode-with-method (method n &optional save)
@@ -465,13 +502,17 @@ so I simply dropped them.")
 
 (defun gnus-uu-save-files (files dir)
   (let ((len (length files))
-       file)
+       to-file file)
     (while files
       (setq file (cdr (assq 'name (car files))))
       (and (file-exists-p file)
-          (copy-file file (if (file-directory-p dir)
-                              (concat dir (file-name-nondirectory file)) dir)
-                     1 t))
+          (progn
+            (setq to-file (if (file-directory-p dir)
+                              (concat dir (file-name-nondirectory file))
+                            dir))
+            (and (or (not (file-exists-p to-file))
+                     (gnus-y-or-n-p (format "%s exists; overwrite? ")))
+                 (copy-file file to-file 1 t))))
       (setq files (cdr files)))
     (message "Saved %d file%s" len (if (> len 1) "s" ""))))
 
@@ -616,6 +657,31 @@ so I simply dropped them.")
     (if (memq 'begin state)
        (cons gnus-uu-binhex-article-name state)
       state)))
+
+;; PostScript
+
+(defun gnus-uu-decode-postscript-article (process-buffer in-state)
+  (let ((state (list 'ok))
+       start-char end-char file-name)
+    (save-excursion
+     (set-buffer process-buffer)
+     (goto-char 1)
+     (if (not (re-search-forward gnus-uu-postscript-begin-string nil t))
+        (setq state (list 'wrong-type))
+       (beginning-of-line)
+       (setq start-char (point))
+       (if (not (re-search-forward gnus-uu-postscript-end-string nil t))
+          (setq state (list 'wrong-type))
+        (setq end-char (point))
+        (set-buffer (get-buffer-create gnus-uu-output-buffer-name))
+        (insert-buffer-substring process-buffer start-char end-char)
+        (setq file-name (concat gnus-uu-work-dir (cdr gnus-article-current) ".ps"))
+        (write-region (point-min) (point-max) file-name)
+        (setq state (list file-name'begin 'end))
+
+        ))
+     )
+    state))
       
 
 ;; Find actions.

diff --git a/lisp/gnus-visual.el b/lisp/gnus-visual.el
index 70c741e..d6685b9 100644 (file)
--- a/lisp/gnus-visual.el
+++ b/lisp/gnus-visual.el
@@ -406,7 +406,7 @@ To check for marks, e.g. to underline replied articles, use
                (overlay-put gnus-newsgroup-selected-overlay 'face 
                             gnus-summary-selected-face))))))
 
-  (defun gnus-visual-highlight-selected-summary ()
+(defun gnus-visual-highlight-selected-summary ()
     ;; Added by Per Abrahamsen <amanda@iesd.auc.dk>.
     ;; Highlight selected article in summary buffer
     (if gnus-summary-selected-face
@@ -415,14 +415,20 @@ To check for marks, e.g. to underline replied articles, use
                 (end (progn (end-of-line) (point)))
                 (to (max 1 (1- (previous-single-property-change
                                 end 'mouse-face nil beg))))
-                (from (1+ (previous-single-property-change 
-                           to 'mouse-face nil beg))))
+                (from (1+ (next-single-property-change 
+                           beg 'mouse-face nil end))))
+           (if (< to beg)
+               (progn
+                 (setq from beg)
+                 (setq to end)))
            (if gnus-newsgroup-selected-overlay
                (move-overlay gnus-newsgroup-selected-overlay 
                              from to (current-buffer))
              (setq gnus-newsgroup-selected-overlay (make-overlay from to))
              (overlay-put gnus-newsgroup-selected-overlay 'face 
-                          gnus-summary-selected-face)))))))
+                          gnus-summary-selected-face))))))
+)
+
 
 ;; New implementation by Christian Limpach <Christian.Limpach@nice.ch>.
 (defun gnus-visual-summary-highlight-line ()

diff --git a/lisp/gnus.el b/lisp/gnus.el
index fb1a1f5..c1f1f71 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -497,6 +497,10 @@ If this variable is nil, scoring will be disabled.")
 (defvar gnus-group-default-list-level 5
   "*Default listing level.")
 
+(defvar gnus-group-always-list-unread 5
+  "*Always list groups less than this variable with unread articles. 
+If nil, use parameter to specify.")
+
 (defvar gnus-user-login-name nil
   "*The login name of the user.
 Got from the function `user-login-name' if undefined.")
@@ -819,13 +823,18 @@ with some simple extensions.
 %s   Subject if it is at the root of a thread, and \"\" otherwise (string)
 %n   Name of the poster (string)
 %A   Address of the poster (string)
-%L   Number of lines in the article (integer)
-%c   Number of characters in the article (integer)
+%F   Contents of the From: header (string)
+%x   Contents of the Xref: header (string)
 %D   Date of the article (string)
+%M   Message-id of the article (string)
+%r   References of the article (string)
+%c   Number of characters in the article (integer)
+%L   Number of lines in the article (integer)
 %I   Indentation based on thread level (a string of spaces)
 %T   A string with two possible values: 80 spaces if the article
      is on thread level two or larger and 0 spaces on level one
-%U   Status of this article (character, \"D\", \"K\", \"-\" or \" \") 
+%R   \"R\" if this article has been replied to, \" \" otherwise (character)
+%U   Status of this article (character, \"D\", \"K\", \"-\" or \" \")
 %[   Opening bracket (character, \"[\" or \"<\")
 %]   Closing bracket (character, \"]\" or \">\")
 %>   Spaces of length thread-level (string)
@@ -902,7 +911,9 @@ If this variable is nil, screen refresh may be quicker.")
 
 ;; Added by Keinonen Kari <kk85613@cs.tut.fi>.
 (defvar gnus-mode-non-string-length 21
-  "*Max length of mode-line non-string contents buffer contents.")
+  "*Max length of mode-line non-string contents.
+If this is nil, Gnus will take space as is needed, leaving the rest
+of the modeline intact.")
 
 ;; Added by Per Abrahamsen <amanda@iesd.auc.dk>.
 (defvar gnus-mouse-face 'highlight
@@ -1267,7 +1278,7 @@ variable (string, integer, character, etc).")
 
 (defconst gnus-summary-mode-line-format-alist 
   (list (list ?G 'group-name ?s)
-       (list ?g '(gnus-short-group-name group-name))
+       (list ?g '(gnus-short-group-name group-name) ?s)
        (list ?A 'article-number ?d)
        (list ?Z 'unread-and-unselected ?s)
        (list ?V 'gnus-version ?s)
@@ -1275,7 +1286,7 @@ variable (string, integer, character, etc).")
        (list ?S 'subject ?s)
        (list ?e 'unselected ?d)
        (list ?u 'user-defined ?s)
-       (list ?s 'gnus-current-score-file ?s)))
+       (list ?s '(gnus-current-score-file-nondirectory)?s)))
 
 (defconst gnus-group-mode-line-format-alist 
   (list (list ?S 'news-server ?s)
@@ -1287,7 +1298,7 @@ variable (string, integer, character, etc).")
 (defconst gnus-maintainer "Lars Magne Ingebrigtsen <larsi@ifi.uio.no>"
   "The mail address of the Gnus maintainer.")
 
-(defconst gnus-version "(ding) Gnus v0.51"
+(defconst gnus-version "(ding) Gnus v0.52"
   "Version number for this version of Gnus.")
 
 (defvar gnus-info-nodes
@@ -1524,6 +1535,10 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.")
   (autoload 'gnus-uu-decode-unshar-and-save-view "gnus-uu")
   (autoload 'gnus-uu-decode-save-view "gnus-uu")
   (autoload 'gnus-uu-decode-binhex-view "gnus-uu")
+  (autoload 'gnus-uu-decode-postscript "gnus-uu")
+  (autoload 'gnus-uu-decode-postscript-and-save "gnus-uu")
+  (autoload 'gnus-uu-decode-postscript-view "gnus-uu")
+  (autoload 'gnus-uu-decode-postscript-and-save-view "gnus-uu")
 
   (autoload 'gnus-kill "gnus-kill")
   (autoload 'gnus-apply-kill-file-internal "gnus-kill")
@@ -1604,6 +1619,22 @@ Optional argument HASHSIZE specifies the table size."
 (defsubst gnus-goto-char (point)
   (and point (goto-char point)))
 
+(defsubst gnus-point-at-bol ()
+  "Return point at the beginning of line."
+  (let ((p (point)))
+    (beginning-of-line)
+    (prog1
+       (point)
+      (goto-char p))))
+
+(defsubst gnus-point-at-eol ()
+  "Return point at the beginning of line."
+  (let ((p (point)))
+    (end-of-line)
+    (prog1
+       (point)
+      (goto-char p))))
+
 \f
 ;;;
 ;;; Gnus Utility Functions
@@ -1632,7 +1663,7 @@ Optional argument HASHSIZE specifies the table size."
 
 (defun gnus-goto-colon ()
   (beginning-of-line)
-  (search-forward ":" (save-excursion (end-of-line) (point)) t))
+  (search-forward ":" (gnus-point-at-eol) t))
 
 (defun gnus-narrow-to-headers ()
   (widen)
@@ -1679,6 +1710,7 @@ Optional argument HASHSIZE specifies the table size."
     (let ((gnus-replied-mark 129)
          (gnus-score-below-mark 130)
          (gnus-score-over-mark 130)
+         (thread nil)
          pos)
       (set-buffer (get-buffer-create " *gnus work*"))
       (buffer-disable-undo (current-buffer))
@@ -3105,7 +3137,7 @@ moves the point to the colon."
         (concat "(gnus-group-set-info '" (prin1-to-string (nth 2 entry))
                 ")")))
     (beginning-of-line)
-    (delete-region (point) (save-excursion (forward-line 1) (point)))
+    (delete-region (point) (progn (forward-line 1) (point)))
     (gnus-group-insert-group-line-info group)
     (forward-line -1)
     (gnus-group-position-cursor)))
@@ -3242,13 +3274,12 @@ If VISIBLE-ONLY is non-nil, the group won't be displayed if it isn't already."
 
 (defun gnus-group-group-name ()
   "Get the name of the newsgroup on the current line."
-  (let ((group (get-text-property 
-               (save-excursion (beginning-of-line) (point)) 'gnus-group)))
+  (let ((group (get-text-property (gnus-point-at-bol) 'gnus-group)))
     (and group (symbol-name group))))
 
 (defun gnus-group-group-level ()
   "Get the level of the newsgroup on the current line."
-  (get-text-property (save-excursion (beginning-of-line) (point)) 'gnus-level))
+  (get-text-property (gnus-point-at-bol) 'gnus-level))
 
 (defun gnus-group-search-forward (&optional backward all level first-too)
   "Find the next newsgroup with unread articles.
@@ -3885,7 +3916,8 @@ specify which levels you are interested in re-scanning."
        (gnus-get-unread-articles (or arg 6)))
     (let ((gnus-read-active-file nil))
       (gnus-get-unread-articles (or arg 6))))
-  (gnus-group-list-groups nil gnus-have-all-newsgroups))
+  (gnus-group-list-groups 
+   (or gnus-group-always-list-unread arg 5) gnus-have-all-newsgroups))
 
 (defun gnus-group-get-new-news-this-group (n)
   "Check for newly arrived news in the current group (and the N-1 next groups).
@@ -4634,6 +4666,9 @@ and the second element is the address."
   (define-key gnus-summary-extract-map "O" 'gnus-uu-decode-save)
   (define-key gnus-summary-extract-map "b" 'gnus-uu-decode-binhex)
   (define-key gnus-summary-extract-map "B" 'gnus-uu-decode-binhex)
+  (define-key gnus-summary-extract-map "p" 'gnus-uu-decode-postscript)
+  (define-key gnus-summary-extract-map "P" 'gnus-uu-decode-postscript-and-save)
+
 
   (define-prefix-command 'gnus-summary-extract-view-map)
   (define-key gnus-summary-extract-map "v" 'gnus-summary-extract-view-map)
@@ -4645,6 +4680,8 @@ and the second element is the address."
   (define-key gnus-summary-extract-view-map "O" 'gnus-uu-decode-save-view)
   (define-key gnus-summary-extract-view-map "b" 'gnus-uu-decode-binhex-view)
   (define-key gnus-summary-extract-view-map "B" 'gnus-uu-decode-binhex-view)
+  (define-key gnus-summary-extract-view-map "p" 'gnus-uu-decode-postscript-view)
+  (define-key gnus-summary-extract-view-map "P" 'gnus-uu-decode-postscript-and-save-view)
   
   
   (define-prefix-command 'gnus-summary-various-map)
@@ -5069,7 +5106,8 @@ If NO-ARTICLE is non-nil, no article is selected initially."
     (message "Couldn't select newsgroup")
     (and (eq major-mode 'gnus-summary-mode)
         (kill-buffer (current-buffer)))
-    (switch-to-buffer gnus-group-buffer)))
+    (switch-to-buffer gnus-group-buffer)
+    (gnus-group-next-unread-group 1)))
 
 (defun gnus-summary-prepare ()
   "Prepare summary list of current newsgroup in summary buffer."
@@ -5799,13 +5837,17 @@ If WHERE is `summary', the summary mode line format will be used."
                 (subject
                  (if gnus-current-headers
                      (header-subject gnus-current-headers) ""))
-                (max-len (- (frame-width) gnus-mode-non-string-length)))
+                (max-len (- (frame-width) gnus-mode-non-string-length))
+                header) ;; passed as argument to any user-format-funcs
            (setq mode-string (eval mformat))
-           (if (> (length mode-string) max-len) 
-               (setq mode-string 
-                     (concat (substring mode-string 0 (- max-len 3)) "...")))
-           (setq mode-string (format (format "%%-%ds" max-len 5)
-                                     mode-string))))
+           (and (numberp max-len)
+                (progn
+                  (if (> (length mode-string) max-len)
+                      (setq mode-string 
+                            (concat (substring mode-string 0 (- max-len 3))
+                                    "...")))
+                  (setq mode-string (format (format "%%-%ds" max-len)
+                                            mode-string))))))
        (setq mode-line-buffer-identification mode-string)
        (set-buffer-modified-p t))))
 
@@ -5949,7 +5991,7 @@ The resulting hash table is returned, or nil if no Xrefs were found."
                 (equal (nth 1 m1) (nth 1 m2)))))))
 
 (defsubst gnus-header-value ()
-  (buffer-substring (match-end 0) (save-excursion (end-of-line) (point))))
+  (buffer-substring (match-end 0) (gnus-point-at-eol)))
 
 (defun gnus-get-newsgroup-headers ()
   (setq gnus-article-internal-prepare-hook nil)
@@ -6119,10 +6161,7 @@ list of headers that match SEQUENCE (see `nntp-retrieve-headers')."
 (defun gnus-nov-parse-line (number dependencies)
   "Point has to be after the number on the beginning of the line."
   (let ((none 0)
-       header eol ref id dep)
-    (save-excursion
-      (end-of-line)
-      (setq eol (point)))
+       header (eol (gnus-point-at-eol)) ref id dep)
     (forward-char)
     ;; overview: [num subject from date id refs chars lines misc]
     (save-restriction
@@ -6372,23 +6411,20 @@ article number."
 
 (defun gnus-summary-thread-level ()
   "The thread level of the article on the current line."
-  (or (get-text-property 
-       (save-excursion (beginning-of-line) (point)) 'gnus-thread)
+  (or (get-text-property (gnus-point-at-bol) 'gnus-thread)
       0))
 
 (defun gnus-summary-pseudo-article ()
   "The thread level of the article on the current line."
-  (get-text-property 
-   (save-excursion (beginning-of-line) (point)) 'gnus-pseudo))
+  (get-text-property (gnus-point-at-bol) 'gnus-pseudo))
 
 (defun gnus-summary-article-mark ()
   "The mark on the current line."
-  (get-text-property (save-excursion (beginning-of-line) (point)) 'gnus-mark))
+  (get-text-property (gnus-point-at-bol) 'gnus-mark))
 
 (defun gnus-summary-subject-string ()
   "Return current subject string or nil if nothing."
-  (get-text-property 
-   (save-excursion (beginning-of-line) (point)) 'gnus-subject))
+  (get-text-property (gnus-point-at-bol) 'gnus-subject))
 
 (defalias 'gnus-summary-score 'gnus-summary-article-score)
 (make-obsolete 'gnus-summary-score 'gnus-summary-article-score)
@@ -7369,6 +7405,7 @@ and `request-accept' functions. (Ie. mail newsgroups at present.)"
   (or (gnus-check-backend-function 'request-move-article gnus-newsgroup-name)
       (error "The current newsgroup does not support article moving"))
   (let ((articles (gnus-summary-work-articles n))
+       (prefix (gnus-group-real-prefix gnus-newsgroup-name))
        art-group)
     (if (and (not to-newsgroup) (not select-method))
        (setq to-newsgroup
@@ -7380,9 +7417,8 @@ and `request-accept' functions. (Ie. mail newsgroups at present.)"
                       (if gnus-current-move-group
                           (format "(%s default) " gnus-current-move-group)
                         ""))
-              gnus-active-hashtb nil nil
-              (gnus-group-real-prefix gnus-newsgroup-name))))
-    (if (string= to-newsgroup "")
+              gnus-active-hashtb nil nil prefix)))
+    (if (or (string= to-newsgroup "") (string= to-newsgroup prefix))
        (setq to-newsgroup (or gnus-current-move-group "")))
     (or (gnus-gethash to-newsgroup gnus-active-hashtb)
        (error "No such group: %s" to-newsgroup))
@@ -7418,7 +7454,8 @@ and `request-accept' functions. (Ie. mail newsgroups at present.)"
                 (article (car articles))
                 (marked (nth 3 info)))
            (gnus-summary-goto-subject article)
-           (delete-region (progn (beginning-of-line) (point))
+           (beginning-of-line)
+           (delete-region (point)
                           (progn (forward-line 1) (point)))
            (if (not (memq article gnus-newsgroup-unreads))
                (setcar (cdr (cdr info))
@@ -7490,6 +7527,7 @@ functions. (Ie. mail newsgroups at present.)"
   (gnus-set-global-variables)
   (let ((articles (gnus-summary-work-articles n))
        (copy-buf (get-buffer-create "*copy work*"))
+       (prefix (gnus-group-real-prefix gnus-newsgroup-name))
        art-group)
     (buffer-disable-undo copy-buf)
     (if (and (not to-newsgroup) (not select-method))
@@ -7502,9 +7540,8 @@ functions. (Ie. mail newsgroups at present.)"
                       (if gnus-current-move-group
                           (format "(%s default) " gnus-current-move-group)
                         ""))
-              gnus-active-hashtb nil nil
-              (gnus-group-real-prefix gnus-newsgroup-name))))
-    (if (string= to-newsgroup "")
+              gnus-active-hashtb nil nil prefix)))
+    (if (or (string= to-newsgroup "") (string= to-newsgroup prefix))
        (setq to-newsgroup (or gnus-current-move-group "")))
     (or (gnus-gethash to-newsgroup gnus-active-hashtb)
        (error "No such group: %s" to-newsgroup))
@@ -8138,7 +8175,8 @@ even ticked and dormant ones."
           (marks (concat "^[" marks "]")))
       (goto-char (point-min))
       (while (search-forward-regexp marks (point-max) t)
-       (delete-region (progn (beginning-of-line) (point))
+       (beginning-of-line)
+       (delete-region (point)
                       (progn (forward-line 1) (point)))))
     (or (zerop (buffer-size))
        (if (eobp)
@@ -8349,8 +8387,9 @@ Returns nil if no thread was there to be shown."
   (prog1
       (save-excursion
        (let ((buffer-read-only nil)
-             (beg (progn (beginning-of-line) (point)))
-             (end (save-excursion (end-of-line) (point))))
+             ;; first goto end then to beg, to have point at beg after let
+             (end (progn (end-of-line) (point)))
+             (beg (progn (beginning-of-line) (point))))
          (prog1
              ;; Any hidden lines here?
              (search-forward "\r" end t)
@@ -8631,7 +8670,8 @@ The variable `gnus-default-article-saver' specifies the saver function."
                    (narrow-to-region (point) (or (search-forward "\n\n" nil t)
                                                  (point-max)))
                    (while (re-search-forward "^X-Gnus" nil t)
-                     (delete-region (progn (beginning-of-line) (point))
+                     (beginning-of-line)
+                     (delete-region (point)
                                     (progn (forward-line 1) (point))))
                    (widen))))
              (if gnus-default-article-saver
@@ -10096,7 +10136,8 @@ If NEWSGROUP is nil, return the global kill file name instead."
   (interactive
    (list (completing-read "Score file: " gnus-score-cache)))
   (setq gnus-current-score-file file)
-  (gnus-score-load-file file))
+  (gnus-score-load-file file)
+  (gnus-set-mode-line 'summary))
 
 (defun gnus-score-edit-alist (file)
   "Edit the current score alist."
@@ -10452,9 +10493,8 @@ If NEWSGROUP is nil, return the global kill file name instead."
       (goto-char (point-min))
       (while (search-forward this-id nil t)
         ;; found a match. remove this line
-        (progn
-          (beginning-of-line)
-          (kill-line 1))))
+       (beginning-of-line)
+       (kill-line 1)))
 
     ;; now for each line: update its articles with score by moving to
     ;; every end-of-line in the buffer and read the articles property
@@ -10911,6 +10951,12 @@ GROUP using BNews sys file syntax."
       (setq files (cdr files)))
     (setq gnus-internal-global-score-files out)))
 
+(defun gnus-current-score-file-nondirectory (&optional score-file)
+  (let ((score-file (or score-file gnus-current-score-file)))
+    (if score-file 
+       (gnus-short-group-name (file-name-nondirectory score-file))
+      "none")))
+
 ;;;
 ;;; Score mode.
 ;;;
@@ -13580,11 +13626,20 @@ If FORCE is non-nil, the .newsrc file is read."
          ;; We have already read .newsrc.eld, so we gently update the
          ;; data in the hash table with the information we have just
          ;; read. 
-         (let ((info (nth 2 (gnus-gethash newsgroup gnus-newsrc-hashtb))))
+         (let ((info (nth 2 (gnus-gethash newsgroup gnus-newsrc-hashtb)))
+               level)
            (if info
                (progn
                  (setcar (nthcdr 2 info) (nreverse read-list))
-                 (setcar (cdr info) (if subscribe 3 (if read-list 6 7))))
+                 ;; We update the level very gently.  In fact, we
+                 ;; only change it if there's been a status change
+                 ;; from subscribed to unsubscribed, or vice versa.
+                 (setq level (nth 1 info))
+                 (cond ((and (<= level 5) (not subscribe))
+                        (setq level (if read-list 6 7)))
+                       ((and (> level 5) subscribe)
+                        (setq level 3)))
+                 (setcar (cdr info) level))
              (setq gnus-newsrc-assoc
                    (cons (list newsgroup (if subscribe 3 (if read-list 6 7))
                                (nreverse read-list))
@@ -13748,7 +13803,7 @@ If FORCE is non-nil, the .newsrc file is read."
                          (read (current-buffer))))
            (skip-chars-forward " \t")
            (set group (buffer-substring 
-                       (point) (save-excursion (end-of-line) (point))))
+                       (point) (gnus-point-at-eol)))
            (forward-line 1))))
       (message "Reading descriptions file...done")
       t)))

diff --git a/lisp/nnbabyl.el b/lisp/nnbabyl.el
index c2c1d18..803282e 100644 (file)
--- a/lisp/nnbabyl.el
+++ b/lisp/nnbabyl.el
@@ -144,7 +144,9 @@
   t)
 
 (defun nnbabyl-server-opened (&optional server)
-  (equal server nnbabyl-current-server))
+  (and (equal server nnbabyl-current-server)
+       nntp-server-buffer
+       (buffer-name nntp-server-buffer)))
 
 (defun nnbabyl-status-message (&optional server)
   nnbabyl-status-string)

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index b9140fd..e6b9f4e 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -61,7 +61,7 @@
 (defvar nnfolder-buffer-alist nil)
 
 (defmacro nnfolder-article-string (article)
-  (` (concat "\n" nnfolder-article-marker (int-to-string (, article)) "")))
+  (` (concat "\n" nnfolder-article-marker (int-to-string (, article)) " ")))
 
 \f
 
@@ -92,6 +92,8 @@
          (delim-string (concat "^" rmail-unix-mail-delimiter))
          beg article art-string start stop)
       (nnfolder-possibly-change-group newsgroup)
+      (set-buffer nnfolder-current-buffer)
+      (goto-char (point-min))
       (while sequence
        (setq article (car sequence))
        (setq art-string (nnfolder-article-string article))
@@ -143,7 +145,9 @@
   t)
 
 (defun nnfolder-server-opened (&optional server)
-  (equal server nnfolder-current-server))
+  (and (equal server nnfolder-current-server)
+       nntp-server-buffer
+       (buffer-name nntp-server-buffer)))
 
 (defun nnfolder-request-close ()
   (let ((alist nnfolder-buffer-alist))
@@ -162,7 +166,7 @@
       nil
     (save-excursion
       (set-buffer nnfolder-current-buffer)
-      (goto-char 1)
+      (goto-char (point-min))
       (if (search-forward (nnfolder-article-string article) nil t)
          (let (start stop)
            (re-search-backward (concat "^" rmail-unix-mail-delimiter) nil t)
@@ -263,12 +267,18 @@
        (setq articles (cdr articles)))
       (save-buffer)
       ;; Find the lowest active article in this group.
-      (let ((active (nth 1 (assoc newsgroup nnfolder-group-alist))))
+      (let* ((active (car (cdr (assoc newsgroup nnfolder-group-alist))))
+            (marker (concat "\n" nnfolder-article-marker))
+            (number "[0-9]+")
+            (activemin (cdr active)))
        (goto-char (point-min))
-       (while (not (search-forward
-                    (nnfolder-article-string (car active)) nil t))
-         (setcar active (1+ (car active)))
-         (goto-char (point-min))))
+       (while (and (search-forward marker nil t)
+                   (re-search-forward number nil t))
+         (setq activemin (min activemin
+                              (string-to-number (buffer-substring
+                                                 (match-beginning 0)
+                                                 (match-end 0))))))
+       (setcar active activemin))
       (nnmail-save-active nnfolder-group-alist nnfolder-active-file)
       rest)))
 
@@ -493,16 +503,17 @@
       ;; Keep track of the active number on our own, and insert it back into
       ;; the active list when we're done. Also, prime the pump to cut down on
       ;; the number of searches we do.
-      (setq end (or (and (re-search-forward delim nil t)
-                        (match-beginning 0))
-                   (point-max)))
+      (setq end (point-marker))
+      (set-marker end (or (and (re-search-forward delim nil t)
+                              (match-beginning 0))
+                         (point-max)))
       (while (not (= end (point-max)))
-       (setq start end)
+       (setq start (marker-position end))
        (goto-char end)
        (end-of-line)
-       (setq end (or (and (re-search-forward delim nil t)
-                          (match-beginning 0))
-                     (point-max)))
+       (set-marker end (or (and (re-search-forward delim nil t)
+                                (match-beginning 0))
+                           (point-max)))
        (goto-char start)
        (if (not (search-forward marker end t))
            (progn

diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el
index d7d4475..3eb7657 100644 (file)
--- a/lisp/nnmbox.el
+++ b/lisp/nnmbox.el
@@ -143,7 +143,9 @@
   t)
 
 (defun nnmbox-server-opened (&optional server)
-  (equal server nnmbox-current-server))
+  (and (equal server nnmbox-current-server)
+       nntp-server-buffer
+       (buffer-name nntp-server-buffer)))
 
 (defun nnmbox-status-message (&optional server)
   nnmbox-status-string)
@@ -247,7 +249,7 @@
        (goto-char (point-min))
        (while (not (search-forward
                     (nnmbox-article-string (car active)) nil t))
-         (setcar (car active) (1+ (car active)))
+         (setcar active (1+ (car active)))
          (goto-char (point-min))))
       (nnmail-save-active nnmbox-group-alist nnmbox-active-file)
       rest)))

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index 1cc9a72..75d04d2 100644 (file)
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -133,7 +133,9 @@
   t)
 
 (defun nnmh-server-opened (&optional server)
-  (equal server nnmh-current-server))
+  (and (equal server nnmh-current-server)
+       nntp-server-buffer
+       (buffer-name nntp-server-buffer)))
 
 (defun nnmh-status-message (&optional server)
   nnmh-status-string)

diff --git a/lisp/nnml.el b/lisp/nnml.el
index e00de71..b071017 100644 (file)
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -160,7 +160,9 @@ all. This may very well take some time.")
   t)
 
 (defun nnml-server-opened (&optional server)
-  (equal server nnml-current-server))
+  (and (equal server nnml-current-server)
+       nntp-server-buffer
+       (buffer-name nntp-server-buffer)))
 
 (defun nnml-status-message (&optional server)
   nnml-status-string)

diff --git a/lisp/nnspool.el b/lisp/nnspool.el
index a265926..1e7e7b3 100644 (file)
--- a/lisp/nnspool.el
+++ b/lisp/nnspool.el
@@ -168,7 +168,9 @@ Newsgroup must be selected before calling this function."
   t)
 
 (defun nnspool-server-opened (&optional server)
-  (equal server nnspool-current-server))
+  (and (equal server nnspool-current-server)
+       nntp-server-buffer
+       (buffer-name nntp-server-buffer)))
 
 (defun nnspool-status-message (&optional server)
   "Return server status response as string."

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 248362e..dfd2e61 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -264,6 +264,8 @@ instead call function `nntp-status-message' to get status message.")
 (defun nntp-server-opened (&optional server)
   "Say whether a connection to SERVER has been opened."
   (and (equal server nntp-current-server)
+       nntp-server-buffer
+       (buffer-name nntp-server-buffer)
        nntp-server-process
        (memq (process-status nntp-server-process) '(open run))))
 
@@ -328,7 +330,7 @@ instead call function `nntp-status-message' to get status message.")
          ;; does, we transform the output.  
          (cond ((looking-at "2[0-9]+")
                 (forward-line 1)
-                (if (looking-at "[^ ] +\\([0-9]\\) +\\([0-9]\\)")
+                (if (looking-at "[^ ]+[ \t]+\\([0-9]\\)[ \t]+\\([0-9]\\)")
                     (let ((end (progn (goto-char (match-beginning 1))
                                       (read (current-buffer))))
                           (beg (read (current-buffer))))

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 4dab8fb..bad28e0 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -3169,6 +3169,7 @@ score (or over the numeric prefix) with this mark
 (@code{gnus-summary-clear-above}).
 @end table
 
+@code{gnus-summary-goto-unread}
 The @code{gnus-summary-goto-unread} variable controls what action should
 be taken after setting a mark.  If non-@code{nil}, point will move to
 the next/previous unread article.  If @code{nil}, point will just move
@@ -3643,6 +3644,7 @@ encoded in some way or other.  Gnus can decode them for you.
 @menu 
 * Uuencoded Articles::    Uudecode articles.
 * Shared Articles::       Unshar articles.
+* PostScript Files::      Split PoscScript.
 @end menu
 
 All these functions use the process/prefix convention
@@ -3738,6 +3740,32 @@ Unshars, views and saves the current series
 (@code{gnus-uu-decode-unshar-and-save-view}). 
 @end table
 
+@node PostScript Files
+@subsection PostScript Files
+@cindex PostScript
+
+@table @kbd
+@item X p
+@kindex X p (Summary)
+@findex gnus-uu-decode-postscript
+Unpack the current PostScript series (@code{gnus-uu-decode-postscript}).
+@item X P
+@kindex X P (Summary)
+@findex gnus-uu-decode-postscript-and-save
+Unpack and save the current PostScript series
+(@code{gnus-uu-decode-postscript-and-save}).
+@item X v p
+@kindex X v p (Summary)
+@findex gnus-uu-decode-postscript-view
+View the current PostScript series
+(@code{gnus-uu-decode-postscript-view}).
+@item X v P
+@kindex X v P (Summary)
+@findex gnus-uu-decode-postscript-and-save-view
+View and save the current PostScript series
+(@code{gnus-uu-decode-postscript-and-save-view}). 
+@end table
+
 @node Decoding Variables
 @subsection Decoding Variables