Mercurial > emacs
changeset 54872:367886fbcfd9
(smerge-popup-context-menu): Use it.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 14 Apr 2004 17:40:57 +0000 |
| parents | 22cdf6999b11 |
| children | bbf96a27b6c5 |
| files | lisp/smerge-mode.el |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)