Mercurial > emacs
comparison lisp/ChangeLog @ 93458:f1bc4ab23ada
*** empty log message ***
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Mon, 31 Mar 2008 11:17:25 +0000 |
parents | 6fdb4c1fec8e |
children | 1f7e9d28dedf |
comparison
equal
deleted
inserted
replaced
93457:4d3eb46a3b84 | 93458:f1bc4ab23ada |
---|---|
1 2008-03-31 Juanma Barranquero <lekktu@gmail.com> | |
2 | |
3 * emacs-lisp/bytecomp.el (byte-compile-warnings-safe-p): | |
4 Use `byte-compile-warning-types'. Add docstring. | |
5 | |
1 2008-03-31 Stefan Monnier <monnier@iro.umontreal.ca> | 6 2008-03-31 Stefan Monnier <monnier@iro.umontreal.ca> |
2 | 7 |
3 * smerge-mode.el (smerge-apply-resolution-patch): New fun. | 8 * smerge-mode.el (smerge-apply-resolution-patch): New fun. |
4 (smerge-resolve): Add various resolution heuristics. | 9 (smerge-resolve): Add various resolution heuristics. |
5 | 10 |