diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-04-14 17:40:57 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-04-14 17:40:57 +0000 |
| commit | 65114860f50064669720032a1c598483395633f2 (patch) | |
| tree | 7dd50239e4af84ec24547acb43fb9bcc6a09dcc5 /lisp/smerge-mode.el | |
| parent | 1a8bd90a3d64fb500a411eb69009bf5604f1b6b4 (diff) | |
| download | emacs-65114860f50064669720032a1c598483395633f2.tar.gz | |
(smerge-popup-context-menu): Use it.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
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) |