Mercurial > emacs

comparison lisp/ChangeLog @ 93970:a2c00669e273

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Juanma Barranquero <lekktu@gmail.com>
date Thu, 10 Apr 2008 09:53:56 +0000
parents a482aa798185
children 5d1c1d3e8c97
comparison
equal deleted inserted replaced
93969:b5052aee45cd 93970:a2c00669e273
1 2008-04-10 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in (AUTOGENEL): Add calc-loaddefs.el.
4
1 2008-04-10 Dan Nicolaescu <dann@ics.uci.edu> 5 2008-04-10 Dan Nicolaescu <dann@ics.uci.edu>
2 6
3 * vc-hooks.el (vc-state): Add new state `conflict'. 7 * vc-hooks.el (vc-state): Add new state `conflict'.
4 (vc-after-save): Use when not if. 8 (vc-after-save): Use when not if.
5 (vc-default-mode-line-string): Deal with the conflict state. 9 (vc-default-mode-line-string): Deal with the conflict state.