From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 14 Apr 2004 17:40:57 +0000 (+0000)
Subject: (smerge-popup-context-menu): Use it.
X-Git-Tag: ttn-vms-21-2-B4~6832
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65114860f50064669720032a1c598483395633f2;p=emacs.git

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

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 9778bb35b01..bd4d8d04a6f 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -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)