HCoop
/
bpt
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1a8bd90
)
(smerge-popup-context-menu): Use it.
author
Stefan Monnier
<monnier@iro.umontreal.ca>
Wed, 14 Apr 2004 17:40:57 +0000
(17:40 +0000)
committer
Stefan Monnier
<monnier@iro.umontreal.ca>
Wed, 14 Apr 2004 17:40:57 +0000
(17:40 +0000)
lisp/smerge-mode.el
patch
|
blob
|
blame
|
history
diff --git
a/lisp/smerge-mode.el
b/lisp/smerge-mode.el
index
9778bb3
..
bd4d8d0
100644
(file)
--- 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)