* replace.el (occur-accumulate-lines): Fix a bug where the first

context line at the beginning of the buffer was missing.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 289bc012bdf963f80da75917141e777ed75f6c39..6ef607e802596f9456004d2a871d8ec14cc021f6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-30  Juri Linkov  <juri@jurta.org>
+
+       * replace.el (occur-accumulate-lines): Fix a bug where the first
+       context line at the beginning of the buffer was missing.
+
 2010-03-30  Eli Zaretskii  <eliz@gnu.org>
 
        * files.el: Make bidi-display-reordering safe variable for boolean

diff --git a/lisp/replace.el b/lisp/replace.el
index 4a8b39dbca7cd00d960bb148fa3a6632e8901acf..a74da4b89b5d1ea69aceaf9871df2af1c3acb42c 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1008,16 +1008,16 @@ which means to discard all text properties."
 (defun occur-accumulate-lines (count &optional keep-props)
   (save-excursion
     (let ((forwardp (> count 0))
-         result beg end)
+         result beg end moved)
       (while (not (or (zerop count)
                      (if forwardp
                          (eobp)
-                       (bobp))))
+                       (and (bobp) (not moved)))))
        (setq count (+ count (if forwardp -1 1)))
        (setq beg (line-beginning-position)
              end (line-end-position))
        (push (occur-engine-line beg end keep-props) result)
-       (forward-line (if forwardp 1 -1)))
+       (setq moved (= 0 (forward-line (if forwardp 1 -1)))))
       (nreverse result))))
 
 (defun occur-read-primary-args ()
@@ -1028,7 +1028,7 @@ which means to discard all text properties."
 
 (defun occur-rename-buffer (&optional unique-p interactive-p)
   "Rename the current *Occur* buffer to *Occur: original-buffer-name*.
-Here `original-buffer-name' is the buffer name were Occur was originally run.
+Here `original-buffer-name' is the buffer name where Occur was originally run.
 When given the prefix argument, or called non-interactively, the renaming
 will not clobber the existing buffer(s) of that name, but use
 `generate-new-buffer-name' instead.  You can add this to `occur-hook'