*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eef2a1f..b03978a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+Fri May  1 21:59:35 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+
+       * gnus.el: Gnus v5.6.9 is released.
+
+Fri May  1 21:54:30 1998  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * nnfolder.el (nnfolder-goto-article): Would infloop.
+
 Fri May  1 19:45:50 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * gnus.el: Gnus v5.6.8 is released.

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 5d3e566..841afd0 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -250,7 +250,7 @@ is restarted, and sometimes reloaded."
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 
-(defconst gnus-version-number "5.6.8"
+(defconst gnus-version-number "5.6.9"
   "Version number for this version of Gnus.")
 
 (defconst gnus-version (format "Gnus v%s" gnus-version-number)

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 3045284..3f8811f 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -478,20 +478,31 @@ time saver for large mailboxes.")
   "Place point at the start of the headers of ARTICLE.
 ARTICLE can be an article number or a Message-ID."
   (let ((art-string (nnfolder-article-string article))
-       end-search end)
-    (while (not end-search)
-      (if (or (search-forward art-string nil t)
-             ;; Don't search the whole file twice!  Also, articles
-             ;; probably have some locality by number, so searching
-             ;; backwards will be faster.  Especially if we're at the
-             ;; beginning of the buffer :-). -SLB
-             (search-backward art-string nil t))
-         (progn
-           (setq end (point))
-           (nnmail-search-unix-mail-delim-backward)
-           (unless (save-excursion (search-forward "\n\n" nil end))
-             (setq end-search 'found)))
-       (setq end-search t)))
+       end-search end start beg)
+    (beginning-of-line)
+    (unless (bobp)
+      (forward-char -1))
+    (setq start (point))
+    (while (and (not end-search)
+               (search-forward art-string nil t))
+      (setq end (point))
+      (nnmail-search-unix-mail-delim-backward)
+      (setq beg (point))
+      (when (and (search-forward "\n\n" nil end)
+                (search-backward art-string nil beg))
+       (setq end-search 'found)
+       (goto-char beg)))
+    (unless end-search
+      (goto-char start)
+      (while (and (not end-search)
+                 (search-backward art-string nil t))
+       (setq end (point))
+       (nnmail-search-unix-mail-delim-backward)
+       (setq beg (point))
+       (when (and (search-forward "\n\n" nil end)
+                  (search-backward art-string nil beg))
+         (setq end-search 'found)
+         (goto-char beg))))
     (eq end-search 'found)))
 
 (defun nnfolder-delete-mail (&optional force leave-delim)

diff --git a/texi/gnus.texi b/texi/gnus.texi
index dc581a9..5410fb5 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename gnus
-@settitle Gnus 5.6.8 Manual
+@settitle Gnus 5.6.9 Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -316,7 +316,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
-@title Gnus 5.6.8 Manual
+@title Gnus 5.6.9 Manual
 
 @author by Lars Magne Ingebrigtsen
 @page
@@ -352,7 +352,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.6.8.
+This manual corresponds to Gnus 5.6.9.
 
 @end ifinfo
 
@@ -15711,7 +15711,7 @@ actually are people who are using Gnus.  Who'd'a thunk it!
 * ding Gnus::          New things in Gnus 5.0/5.1, the first new Gnus.
 * September Gnus::     The Thing Formally Known As Gnus 5.3/5.3.
 * Red Gnus::           Third time best---Gnus 5.4/5.5.
-* Quassia Gnus::       Two times two is four, or Gnus 5.6.8.
+* Quassia Gnus::       Two times two is four, or Gnus 5.6.9.
 @end menu
 
 These lists are, of course, just @emph{short} overviews of the
@@ -16246,7 +16246,7 @@ Emphasized text can be properly fontisized:
 @node Quassia Gnus
 @subsubsection Quassia Gnus
 
-New features in Gnus 5.6.8:
+New features in Gnus 5.6.9:
 
 @itemize @bullet
 

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