bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#46876: [PATCH] Find conflict markers in opened buffers as well


From: Dmitry Gutov
Subject: bug#46876: [PATCH] Find conflict markers in opened buffers as well
Date: Tue, 9 Mar 2021 16:15:02 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1

On 09.03.2021 08:32, Konstantin Kharlamov wrote:

This part is suboptimal:

  > When a file is already open in
  > Emacs, (vc-find-conflicted-file) only switches to that buffer

...and I had to spend some time figuring out why that happens (hint:
vc-git-find-file-hook), and that kind of unpredictable behavior is Not
Good(tm).

Back when I stumbled upon this behaviour, I didn't research into it because I 
thought it could be deliberate. The reasoning might have been: if you didn't 
have a file opened, it doesn't really matter where your point would be once it 
is. So it shouldn't hurt to just jump to a conflict marker, and so it does. On 
the other hand, if you did have the file opened, you might not want to lose 
position of your point (for example, you could have a selection, which you 
don't want to lose for some reason), IOW initial point position in this case 
might matter.

I'm just speculating though, I do not know if it's true, neither I remember 
having a usecase as the one I imagine it's trying to cover. FWIW, usually when 
I want to save positions in a buffer, I use (evil-set-marker) from Evil package.

I don't use Evil, but set-mark should work.

In any case, when the user is calling vc-find-conflicted-file, they probably want to either always go to the conflict markers (whether the file has been visited or not), or never. And "always" probably makes more sense.

It's not urgent, though, especially with neither command having a default binding.





reply via email to

[Prev in Thread] Current Thread [Next in Thread]