procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(smerge-popup-context-menu): Put unwind-protect' arround overlay-put' and `popup-menu'.

Browse source
This commit is contained in:
Masatake YAMATO 2004-03-16 16:27:10 +00:00
parent 68eb03ca88
commit 935ce7caa0
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lisp/smerge-mode.el
View file

@ -321,13 +321,15 @@ according to `smerge-match-conflict'.")
(popup-menu smerge-mode-menu)
;; Install overlay.
(setq o (make-overlay (match-beginning i) (match-end i)))
(overlay-put o 'face 'highlight)
(sit-for 0)
(popup-menu (if (smerge-check 2)
smerge-mode-menu
smerge-context-menu))
;; Delete overlay.
(delete-overlay o))))
(unwind-protect
(progn
(overlay-put o 'face 'highlight)
(sit-for 0)
(popup-menu (if (smerge-check 2)
smerge-mode-menu
smerge-context-menu)))
;; Delete overlay.
(delete-overlay o)))))
;; There's no conflict at point, the text-props are just obsolete.
(save-excursion
(let ((beg (re-search-backward smerge-end-re nil t))