Mercurial > emacs
comparison lisp/smerge-mode.el @ 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 | 192fc783e115 |
| children | 922f49230ff5 0643dc72a250 |
comparison
equal
deleted
inserted
replaced
| 54871:22cdf6999b11 | 54872:367886fbcfd9 |
|---|---|
| 312 | 312 |
| 313 (defun smerge-popup-context-menu (event) | 313 (defun smerge-popup-context-menu (event) |
| 314 "Pop up the Smerge mode context menu under mouse." | 314 "Pop up the Smerge mode context menu under mouse." |
| 315 (interactive "e") | 315 (interactive "e") |
| 316 (if (and smerge-mode | 316 (if (and smerge-mode |
| 317 (save-excursion (mouse-set-point event) (smerge-check 1))) | 317 (save-excursion (posn-set-point (event-end event)) (smerge-check 1))) |
| 318 (progn | 318 (progn |
| 319 (mouse-set-point event) | 319 (posn-set-point (event-end event)) |
| 320 (smerge-match-conflict) | 320 (smerge-match-conflict) |
| 321 (let ((i (smerge-get-current)) | 321 (let ((i (smerge-get-current)) |
| 322 o) | 322 o) |
| 323 (if (<= i 0) | 323 (if (<= i 0) |
| 324 ;; Out of range | 324 ;; Out of range |