aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorMasatake YAMATO <[email protected]>2004-03-16 16:27:10 +0000
committerMasatake YAMATO <[email protected]>2004-03-16 16:27:10 +0000
commit935ce7caa0085c8530f6c70b43b5d3b14bbaffd3 (patch)
treed435b9ea2929faf2d1083ca0ef085dd5aafec5f0 /lisp/ChangeLog
parent68eb03ca88b06f7f4428db0164ae9758c29ffda4 (diff)
(smerge-popup-context-menu): Put `unwind-protect' arround `overlay-put' and `popup-menu'.
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2db90ad37a..d36c88ede9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-17 Masatake YAMATO <[email protected]>
+
+ * smerge-mode.el (smerge-popup-context-menu): Put
+ `unwind-protect' arround `overlay-put' and `popup-menu'.
+
2004-03-16 Masatake YAMATO <[email protected]>
* register.el (register): Provide `register' feature.