# HG changeset patch
# User Masatake YAMATO <jet@gyve.org>
# Date 1079454430 0
# Node ID 85cd76b8b78c0d5fef9fb488298669cfe23b0c6a
# Parent  a9f1e961161291f898bb505f12aceab7828a9036
(smerge-popup-context-menu): Put `unwind-protect' arround `overlay-put' and `popup-menu'.

diff -r a9f1e9611612 -r 85cd76b8b78c lisp/ChangeLog
--- 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.
diff -r a9f1e9611612 -r 85cd76b8b78c lisp/smerge-mode.el
--- 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))