Mercurial > emacs
changeset 107652:861199fb7574
* replace.el (occur-accumulate-lines): Fix a bug where the first
context line at the beginning of the buffer was missing.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Tue, 30 Mar 2010 18:44:50 +0300 |
| parents | c7340d934f35 |
| children | bfde3c2dbef5 |
| files | lisp/ChangeLog lisp/replace.el |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Mar 30 14:15:45 2010 +0200 +++ b/lisp/ChangeLog Tue Mar 30 18:44:50 2010 +0300 @@ -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
--- a/lisp/replace.el Tue Mar 30 14:15:45 2010 +0200 +++ b/lisp/replace.el Tue Mar 30 18:44:50 2010 +0300 @@ -1008,16 +1008,16 @@ (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 @@ (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'