procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix occur for non-nil list-matching-lines-jump-to-current-line (bug#33476)

Browse source 
* lisp/replace.el (occur-engine): Move orig-line let-binding higher.
Don't use start-line in forward-line.
This commit is contained in:
Juri Linkov 2018-12-10 01:53:08 +02:00
parent 38f2b58271
commit f8179cd366
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lisp/replace.el
View file

@ -1657,7 +1657,10 @@ See also `multi-occur'."
(lines 0) ; count of matching lines
(matches 0) ; count of matches
(headerpt (with-current-buffer out-buf (point)))
)
(orig-line (if (not (overlayp boo))
(line-number-at-pos)
(line-number-at-pos
(overlay-get boo 'occur--orig-point)))))
(save-excursion
;; begin searching in the buffer
(goto-char (if (overlayp boo) (overlay-start boo) (point-min)))
@ -1665,9 +1668,6 @@ See also `multi-occur'."
(let* ((limit (if (overlayp boo) (overlay-end boo) (point-max)))
(start-line (line-number-at-pos))
(curr-line start-line) ; line count
(orig-line (if (not (overlayp boo)) 1
(line-number-at-pos
(overlay-get boo 'occur--orig-point))))
(orig-line-shown-p)
(prev-line nil) ; line number of prev match endpt
(prev-after-lines nil) ; context lines of prev match
@ -1796,7 +1796,7 @@ See also `multi-occur'."
(setq orig-line-shown-p t)
(save-excursion
(goto-char (point-min))
(forward-line (- orig-line start-line 1))
(forward-line (1- orig-line))
(occur-engine-line (line-beginning-position)
(line-end-position) keep-props)))))
;; Actually insert the match display data
@ -1834,7 +1834,7 @@ See also `multi-occur'."
(let ((orig-line-str
(save-excursion
(goto-char (point-min))
(forward-line (- orig-line start-line 1))
(forward-line (1- orig-line))
(occur-engine-line (line-beginning-position)
(line-end-position) keep-props))))
(add-face-text-property