Mercurial > emacs
comparison lisp/ChangeLog @ 85466:c610862b85d0
*** empty log message ***
| author | John Paul Wallington <jpw@pobox.com> |
|---|---|
| date | Sat, 20 Oct 2007 01:53:11 +0000 |
| parents | b9fe84d8ca5a |
| children | 6ae4584fb3f6 |
comparison
equal
deleted
inserted
replaced
| 85465:b9fe84d8ca5a | 85466:c610862b85d0 |
|---|---|
| 1 2007-10-20 John Paul Wallington <jpw@pobox.com> | |
| 2 | |
| 3 * help-fns.el (describe-variable-custom-version-info): New function | |
| 4 to return variable's version or package version note. | |
| 5 (describe-variable): Use it, display result. | |
| 6 | |
| 1 2007-10-20 Stefan Monnier <monnier@iro.umontreal.ca> | 7 2007-10-20 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 |
| 3 * smerge-mode.el (smerge-auto-refine): New var. | 9 * smerge-mode.el (smerge-auto-refine): New var. |
| 4 (smerge-next, smerge-prev): Use it. | 10 (smerge-next, smerge-prev): Use it. |
| 5 (smerge-batch-resolve): Ad-hoc trick for Arch's .rej files. | 11 (smerge-batch-resolve): Ad-hoc trick for Arch's .rej files. |