Mercurial > emacs
diff lisp/ChangeLog @ 91059:12589730c028
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 901)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-273
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 20 Oct 2007 02:30:26 +0000 |
| parents | 4b09bb044f38 |
| children | 74ab3ea909f9 |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Oct 20 02:22:59 2007 +0000 +++ b/lisp/ChangeLog Sat Oct 20 02:30:26 2007 +0000 @@ -5,6 +5,25 @@ 2007-10-20 Stefan Monnier <monnier@iro.umontreal.ca> + * diff-mode.el (diff-auto-refine): New var. + (diff-hunk): Use it. + (diff-ignore-whitespace-hunk): Rename diff-refine-ignore-spaces-hunk. + (diff-refine-change): Rename from diff-fine-change. Change it. + (diff-refine-preproc): Rename from diff-fine-highlight-preproc. + (diff-refine-hunk): Rename from diff-fine-highlight. + +2007-10-20 John Paul Wallington <jpw@pobox.com> + + * help-fns.el (describe-variable-custom-version-info): New function + to return variable's version or package version note. + (describe-variable): Use it, display result. + +2007-10-20 Stefan Monnier <monnier@iro.umontreal.ca> + + * smerge-mode.el (smerge-auto-refine): New var. + (smerge-next, smerge-prev): Use it. + (smerge-batch-resolve): Ad-hoc trick for Arch's .rej files. + * emacs-lisp/easy-mmode.el (easy-mmode-define-navigation): Add `body' arg. Cleanup the check-narrow-maybe/re-narrow-maybe mess.