Mercurial > emacs
changeset 54410:85cd76b8b78c
(smerge-popup-context-menu): Put `unwind-protect' arround `overlay-put' and `popup-menu'.
| author | Masatake YAMATO <jet@gyve.org> |
|---|---|
| date | Tue, 16 Mar 2004 16:27:10 +0000 |
| parents | a9f1e9611612 |
| children | 3898648aa99b |
| files | lisp/ChangeLog lisp/smerge-mode.el |
| diffstat | 2 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Mar 16 15:20:17 2004 +0000 +++ b/lisp/ChangeLog Tue Mar 16 16:27:10 2004 +0000 @@ -1,3 +1,8 @@ +2004-03-17 Masatake YAMATO <jet@gyve.org> + + * smerge-mode.el (smerge-popup-context-menu): Put + `unwind-protect' arround `overlay-put' and `popup-menu'. + 2004-03-16 Masatake YAMATO <jet@gyve.org> * register.el (register): Provide `register' feature.
--- a/lisp/smerge-mode.el Tue Mar 16 15:20:17 2004 +0000 +++ b/lisp/smerge-mode.el Tue Mar 16 16:27:10 2004 +0000 @@ -321,13 +321,15 @@ (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))