bug#33476: [PATCH] Fix occur revert with list-matching-lines-jump-to-current-line

[Juri Linkov]

>> I propose to install the patch from OP.  This patch avoids the error.
>> It still might behave incorrectly in some cases, but at least it
>> doesn't raise the error.
>
> OK, please push that to emacs-26, and thanks.

Done.

The file admin/notes/repo instructs to use the phrase
"Not to be merged to master" to indicate that it should
not be merged to the master.

But actually `gitmerge-skip-regexp' doesn't match this phrase:

(string-match gitmerge-skip-regexp "; Not to be merged to master")
nil

Should admin/gitmerge.el be fixed to support this phrase
before the next merge to master?

>> >> But still I found a bug in master that can be fixed with another patch.
>> >> The following patch is for Emacs 27:
>> >
>> > What is the bug you found in the master branch?
>> 
>> In the master branch when `list-matching-lines-jump-to-current-line'
>> is non-nil, it doesn't show the current line highlighted.
>
> Fine with me.

Done.