diff options
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
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. |