# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1081964457 0
# Node ID 367886fbcfd9fc6938488a118471a6468158f236
# Parent  22cdf6999b1172c38a2311f28c0b0fac50784ddf
(smerge-popup-context-menu): Use it.

diff -r 22cdf6999b11 -r 367886fbcfd9 lisp/smerge-mode.el
--- a/lisp/smerge-mode.el	Wed Apr 14 17:38:23 2004 +0000
+++ b/lisp/smerge-mode.el	Wed Apr 14 17:40:57 2004 +0000
@@ -314,9 +314,9 @@
   "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)