Commit 65114860 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(smerge-popup-context-menu): Use it.

parent 1a8bd90a
......@@ -314,9 +314,9 @@ according to `smerge-match-conflict'.")
"Pop up the Smerge mode context menu under mouse."
(interactive "e")
(if (and smerge-mode
(save-excursion (mouse-set-point event) (smerge-check 1)))
(save-excursion (posn-set-point (event-end event)) (smerge-check 1)))
(progn
(mouse-set-point event)
(posn-set-point (event-end event))
(smerge-match-conflict)
(let ((i (smerge-get-current))
o)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment