*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3171ea7..925585b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,49 @@
+Sat Jul 19 23:32:28 1997  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+
+       * gnus.el: Gnus v5.4.64 is released.
+
+Sat Jul 19 23:22:03 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus-art.el (gnus-article-set-globals): New function.
+
+1997-07-17  Steven L Baur  <steve@altair.xemacs.org>
+
+       * gnus-ems.el (gnus-mode-line-modified): Refine detection on
+       whether narrow indicators should be used.
+
+Sat Jul 19 23:04:30 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus-cache.el (gnus-jog-cache): Bind gnus-auto-select-next.
+
+Sat Jul 19 23:00:33 1997  Guy Geens  <Guy.Geens@elis.rug.ac.be>
+
+       * gnus-score.el (gnus-score-load-file): Fix decay.
+
+Sat Jul 19 20:21:42 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus-group.el (gnus-group-iterate): Save excursion.
+
+       * gnus-score.el (message): Required.
+
+       * gnus-sum.el (gnus-summary-limit-children): Unreads, not reads.
+
+       * gnus-topic.el (gnus-topic-change-level): Move groups.
+
+       * gnus-cache.el (gnus-jog-cache): Protect against nil groups.
+
+       * message.el (message-generate-headers): Don't delete Message-ID
+       if buffer not modified.
+
+       * gnus.el (gnus-simplify-mode-line): Use varying formats.
+
+       * gnus-xmas.el (gnus-xmas-group-remove-excess-properties): Removed.
+       (gnus-xmas-topic-remove-excess-properties): Removed.
+
+Sat Jul 12 21:04:08 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus-start.el (gnus-activate-group): Always return the right
+       active range.
+
 Sat Jul 12 19:46:22 1997  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * gnus.el: Gnus v5.4.63 is released.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index a3e8aa9..5ec5705 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2180,6 +2180,7 @@ Argument LINES specifies lines to be scrolled down."
   (interactive)
   (if (not (gnus-buffer-live-p gnus-summary-buffer))
       (error "There is no summary buffer for this article buffer")
+    (gnus-article-set-globals)
     (gnus-configure-windows 'article)
     (gnus-summary-goto-subject gnus-current-article)))
 
@@ -2876,6 +2877,11 @@ specified by `gnus-button-alist'."
 
 ;;; Internal functions:
 
+(defun gnus-article-set-globals ()
+  (save-excursion
+    (set-buffer gnus-summary-buffer)
+    (gnus-set-global-variables)))
+
 (defun gnus-signature-toggle (end)
   (save-excursion
     (set-buffer gnus-article-buffer)

diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index 754a56f..9df270f 100644 (file)
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -548,12 +548,14 @@ $ emacs -batch -l ~/.emacs -l gnus -f gnus-jog-cache"
      nil nil
      (lambda ()
        (interactive)
-       (gnus-summary-read-group (gnus-group-group-name) nil t)
-       ;; ... and enter the articles into the cache.
-       (when (eq major-mode 'gnus-summary-mode)
-        (gnus-uu-mark-buffer)
-        (gnus-cache-enter-article)
-        (kill-buffer (current-buffer)))))))
+       (when (gnus-group-group-name)
+        (let (gnus-auto-select-next)
+          (gnus-summary-read-group (gnus-group-group-name) nil t)
+          ;; ... and enter the articles into the cache.
+          (when (eq major-mode 'gnus-summary-mode)
+            (gnus-uu-mark-buffer)
+            (gnus-cache-enter-article)
+            (kill-buffer (current-buffer)))))))))
 
 (defun gnus-cache-read-active (&optional force)
   "Read the cache active file."

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 05f8f7c..7b7d6be 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -35,8 +35,8 @@
 (defvar gnus-mouse-2 [mouse-2])
 (defvar gnus-down-mouse-2 [down-mouse-2])
 (defvar gnus-mode-line-modified
-  (if (and (not gnus-xemacs)
-          (< emacs-major-version 20))
+  (if (or gnus-xemacs
+         (< emacs-major-version 20))
       '("--**-" . "-----")
     '("**" "--")))
 

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 83d9bce..0058c12 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1451,7 +1451,9 @@ and with point over the group in question."
        group)
     (while (setq group (pop groups))
       (gnus-group-remove-mark group)
-      (funcall function group))))
+      (save-excursion
+       (save-selected-window
+         (funcall function group))))))
 
 (put 'gnus-group-iterate 'lisp-indent-function 1)
 

diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el
index f062db6..aed777c 100644 (file)
--- a/lisp/gnus-salt.el
+++ b/lisp/gnus-salt.el
@@ -950,7 +950,7 @@ The following commands are available:
 \\{gnus-carpal-mode-map}"
   (interactive)
   (kill-all-local-variables)
-  (setq mode-line-modified "-- ")
+  (setq mode-line-modified (cdr gnus-mode-line-modified))
   (setq major-mode 'gnus-carpal-mode)
   (setq mode-name "Gnus Carpal")
   (setq mode-line-process nil)

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 6e102d2..abd23d3 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -29,6 +29,7 @@
 (require 'gnus)
 (require 'gnus-sum)
 (require 'gnus-range)
+(require 'message)
 
 (defcustom gnus-global-score-files nil
   "List of global score files and directories.
@@ -1083,7 +1084,7 @@ SCORE is the score to add."
       ;; Perform possible decays.
       (when gnus-decay-scores
        (when (or (not decay)
-                 (gnus-decay-scores alist (gnus-time-to-day (current-time))))
+                 (gnus-decay-scores alist decay))
          (gnus-score-set 'touched '(t) alist)
          (gnus-score-set 'decay (list (gnus-time-to-day (current-time))))))
       ;; We do not respect eval and files atoms from global score
@@ -2730,7 +2731,7 @@ If ADAPT, return the home adaptive file instead."
   "Decay SCORE according to `gnus-score-decay-constant' and `gnus-score-decay-scale'."
   (floor
    (- score
-      (* (if (< score 0) 1 -1)
+      (* (if (< score 0) -1 1)
         (min (abs score)
              (max gnus-score-decay-constant
                   (* (abs score)

diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el
index ee5d46c..fc4ec01 100644 (file)
--- a/lisp/gnus-srvr.el
+++ b/lisp/gnus-srvr.el
@@ -694,7 +694,9 @@ buffer.
       ;; If this group it killed, then we want to subscribe it.
       (when (= (following-char) ?K)
        (setq sub t))
-      (setq group (gnus-browse-group-name))
+      (when (gnus-gethash (setq group (gnus-browse-group-name))
+                         gnus-newsrc-hashtb)
+       (error "Group already subscribed"))
       ;; Make sure the group has been properly removed before we
       ;; subscribe to it.
       (gnus-kill-ephemeral-group group)

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index e208a38..0a4ab48 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1212,7 +1212,8 @@ for new groups."
           (format
            "(gnus-group-set-info '%S)" info)))))
       (when gnus-group-change-level-function
-       (funcall gnus-group-change-level-function group level oldlevel)))))
+       (funcall gnus-group-change-level-function
+                group level oldlevel previous)))))
 
 (defun gnus-kill-newsgroup (newsgroup)
   "Obsolete function.  Kills a newsgroup."
@@ -1314,12 +1315,13 @@ newsgroup."
         ;; command may have responded with the `(0 . 0)'.  We
         ;; ignore this if we already have an active entry
         ;; for the group.
-        (unless (and (zerop (car active))
-                     (zerop (cdr active))
-                     (gnus-active group))
-          (gnus-set-active group active))
-        ;; Return the new active info.
-        active)))
+        (if (and (zerop (car active))
+                 (zerop (cdr active))
+                 (gnus-active group))
+            (gnus-active group)
+          (gnus-set-active group active)
+          ;; Return the new active info.
+          active))))
 
 (defun gnus-get-unread-articles-in-group (info active &optional update)
   (when active

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 7049e89..b9a5dad 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -6053,8 +6053,8 @@ fetch-old-headers verbiage, and so on."
                     (gnus-nocem-unwanted-article-p
                      (mail-header-id (car thread))))
                (progn
-                 (setq gnus-newsgroup-reads
-                       (delq number gnus-newsgroup-reads))
+                 (setq gnus-newsgroup-unreads
+                       (delq number gnus-newsgroup-unreads))
                  t))))
          ;; Nope, invisible article.
          0

diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el
index 942c456..05fa582 100644 (file)
--- a/lisp/gnus-topic.el
+++ b/lisp/gnus-topic.el
@@ -512,8 +512,7 @@ articles in the topic and its subtopics."
     (gnus-add-text-properties
      (point)
      (prog1 (1+ (point))
-       (eval gnus-topic-line-format-spec)
-       (gnus-topic-remove-excess-properties)1)
+       (eval gnus-topic-line-format-spec))
      (list 'gnus-topic (intern name)
           'gnus-topic-level level
           'gnus-topic-unread unread
@@ -722,10 +721,11 @@ articles in the topic and its subtopics."
        (push (cons topic-name (nreverse filtered-topic)) result)))
     (setq gnus-topic-alist (nreverse result))))
 
-(defun gnus-topic-change-level (group level oldlevel)
+(defun gnus-topic-change-level (group level oldlevel previous)
   "Run when changing levels to enter/remove groups from topics."
   (save-excursion
     (set-buffer gnus-group-buffer)
+    (gnus-group-goto-group (or (car (nth 2 previous)) group))
     (when (and gnus-topic-mode
               gnus-topic-alist
               (not gnus-topic-inhibit-change-level))

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 3f12384..11a992f 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -371,26 +371,6 @@ call it with the value of the `gnus-data' text property."
               (event-to-character event))
          event)))
 
-(defun gnus-xmas-group-remove-excess-properties ()
-  (let ((end (point))
-       (beg (progn (forward-line -1) (point))))
-    (remove-text-properties (1+ beg) end '(gnus-group nil))
-    (remove-text-properties
-     beg end
-     '(gnus-topic nil gnus-topic-level nil gnus-topic-visible nil))
-    (goto-char end)
-    (map-extents
-     (lambda (e ma)
-       (set-extent-property e 'start-closed t))
-     (current-buffer) beg end)))
-
-(defun gnus-xmas-topic-remove-excess-properties ()
-  (let ((end (point))
-       (beg (progn (forward-line -1) (point))))
-    (remove-text-properties beg end '(gnus-group nil gnus-unread nil))
-    (remove-text-properties (1+ beg) end '(gnus-topic nil))
-    (goto-char end)))
-
 (defun gnus-xmas-seconds-since-epoch (date)
   "Return a floating point number that says how many seconds have lapsed between Jan 1 12:00:00 1970 and DATE."
   (let* ((tdate (mapcar (lambda (ti) (and ti (string-to-int ti)))

diff --git a/lisp/gnus.el b/lisp/gnus.el
index d2b5495..514fa20 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -238,7 +238,7 @@ is restarted, and sometimes reloaded."
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 
-(defconst gnus-version-number "5.4.63"
+(defconst gnus-version-number "5.4.64"
   "Version number for this version of Gnus.")
 
 (defconst gnus-version (format "Gnus v%s" gnus-version-number)
@@ -267,7 +267,6 @@ be set in `.emacs' instead."
   (defalias 'gnus-extent-start-open 'ignore)
   (defalias 'gnus-set-text-properties 'set-text-properties)
   (defalias 'gnus-group-remove-excess-properties 'ignore)
-  (defalias 'gnus-topic-remove-excess-properties 'ignore)
   (defalias 'gnus-appt-select-lowest-window 'appt-select-lowest-window)
   (defalias 'gnus-mail-strip-quoted-names 'mail-strip-quoted-names)
   (defalias 'gnus-character-to-event 'identity)
@@ -2077,7 +2076,7 @@ that that variable is buffer-local to the summary buffers."
 
 (defun gnus-simplify-mode-line ()
   "Make mode lines a bit simpler."
-  (setq mode-line-modified "-- ")
+  (setq mode-line-modified (cdr gnus-mode-line-modified))
   (when (listp mode-line-format)
     (make-local-variable 'mode-line-format)
     (setq mode-line-format (copy-sequence mode-line-format))

diff --git a/lisp/message.el b/lisp/message.el
index 17ad132..3aafaf5 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2668,6 +2668,8 @@ Headers already prepared in the buffer are not modified."
           header value elem)
       ;; First we remove any old generated headers.
       (let ((headers message-deletable-headers))
+       (unless (buffer-modified-p)
+         (setq headers (delq 'Message-ID (copy-sequence headers))))
        (while headers
          (goto-char (point-min))
          (and (re-search-forward

diff --git a/lisp/pop3.el b/lisp/pop3.el
index 65d0fca..f28ef17 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -1,10 +1,10 @@
 ;;; pop3.el --- Post Office Protocol (RFC 1460) interface
 
-;; Copyright (C) 1996, Free Software Foundation, Inc.
+;; Copyright (C) 1996,1997 Free Software Foundation, Inc.
 
 ;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
 ;; Keywords: mail, pop3
-;; Version: 1.3e
+;; Version: 1.3g
 
 ;; This file is part of GNU Emacs.
 
@@ -37,7 +37,7 @@
 (require 'mail-utils)
 (provide 'pop3)
 
-(defconst pop3-version "1.3c")
+(defconst pop3-version "1.3g")
 
 (defvar pop3-maildrop (or user-login-name (getenv "LOGNAME") (getenv "USER") nil)
   "*POP3 maildrop.")
@@ -77,7 +77,7 @@ Used for APOP authentication.")
          ((equal 'pass pop3-authentication-scheme)
           (pop3-user process pop3-maildrop)
           (pop3-pass process))
-         (t (error "Invalid POP3 authentication scheme")))
+         (t (error "Invalid POP3 authentication scheme.")))
     (setq message-count (car (pop3-stat process)))
     (while (<= n message-count)
       (message (format "Retrieving message %d of %d from %s..."
@@ -201,6 +201,7 @@ Return the response string if optional second argument is non-nil."
 
 (defun pop3-munge-message-separator (start end)
   "Check to see if a message separator exists.  If not, generate one."
+  (if (not (fboundp 'message-make-date)) (autoload 'message-make-date "message"))
   (save-excursion
     (save-restriction
       (narrow-to-region start end)
@@ -210,7 +211,8 @@ Return the response string if optional second argument is non-nil."
                   (looking-at "BABYL OPTIONS:") ; Babyl
                   ))
          (let ((from (mail-strip-quoted-names (mail-fetch-field "From")))
-               (date (pop3-string-to-list (mail-fetch-field "Date")))
+               (date (pop3-string-to-list (or (mail-fetch-field "Date")
+                                              (message-make-date))))
                (From_))
            ;; sample date formats I have seen
            ;; Date: Tue, 9 Jul 1996 09:04:21 -0400 (EDT)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index cef99ef..923487c 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jul 19 23:02:03 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus.texi (Followups To Yourself): \\(_-_\\)?
+
 Sat Jul 12 16:29:35 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
 
        * gnus.texi (Picon Configuration): Moved Picons to under XEmacs. 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 3aacc2c..3276e04 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename gnus
-@settitle Gnus 5.4.63 Manual
+@settitle Gnus 5.4.64 Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -309,7 +309,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
-@title Gnus 5.4.63 Manual
+@title Gnus 5.4.64 Manual
 
 @author by Lars Magne Ingebrigtsen
 @page
@@ -345,7 +345,7 @@ can be gotten by any nefarious means you can think of---@sc{nntp}, local
 spool or your mbox file.  All at the same time, if you want to push your
 luck.
 
-This manual corresponds to Gnus 5.4.63.
+This manual corresponds to Gnus 5.4.64.
 
 @end ifinfo
 
@@ -11694,7 +11694,8 @@ myself:
 
 @lisp
 ("references"
- ("<x6[0-9a-z]+\\.fsf@@.*eyesore.no>" 1000 nil r))
+ ("<x6[0-9a-z]+\\.fsf\\(_-_\\)?@@.*eyesore.no>"
+  1000 nil r))
 @end lisp
 
 Whether it's the first two or first three characters that are ``yours''

diff --git a/texi/message.texi b/texi/message.texi
index e83a2cf..a2e939b 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename message
-@settitle Message 5.4.63 Manual
+@settitle Message 5.4.64 Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -39,7 +39,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
-@title Message 5.4.63 Manual
+@title Message 5.4.64 Manual
 
 @author by Lars Magne Ingebrigtsen
 @page
@@ -79,7 +79,7 @@ buffers.
 * Key Index::         List of Message mode keys.
 @end menu
 
-This manual corresponds to Message 5.4.63.  Message is distributed with
+This manual corresponds to Message 5.4.64.  Message is distributed with
 the Gnus distribution bearing the same version number as this manual
 has.