[Top][All Lists]

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

Re: problems with smerge-mode.el

From: Alexandru Harsanyi
Subject: Re: problems with smerge-mode.el
Date: Sat, 17 Dec 2005 12:15:56 +0800

On 16 Dec 2005, at 6:35 AM, Stefan Monnier wrote:

That's odd.  I can't see any place in smerge-remove-props where the
match-data might be clobbered.

And I can't reproduce your problem: M-x smerge-keep-current works just fine in my tests. I suspect it may be something like a bad interaction with an after-change-function that doesn't properly save the match data. Can you give a more precise recipe to reproduce the problem, starting from "emacs -Q"?

I updated the emacs sources as of today (16 Dec), rebuilt it, than started it using:

        /usr/local/bin/emacs -Q

I created two test files, one called test.cc, the other test.txt, both containing:

<<<<<<< test.txt
>>>>>>> 1.1

Than, for each file, I visited it using emacs, enabled smerge-mode, moved the cursor on the 'gamma' line than did 'M-x smerge-keep-current'.

On test.cc I got the error, for test.txt smerge-mode selected the 'gamma' line correctly. Perhaps the problem is related to c++-mode? I was resolving conflicts in a C++ file when I discovered the bug...

Hope this helps.  If you need more information, I'm happy to help.

Best Regards,

reply via email to

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