Mercurial > emacs
diff lisp/ChangeLog @ 111421:ac911360c429
Minor emerge changes.
* lisp/vc/emerge.el (emerge-eval-in-buffer): Remove, and replace all uses
with with-current-buffer.
(diff, template): Give dynamic local variables a prefix.
(emerge-line-numbers): Rename local `diff' to emerge-line-diff.
(emerge-line-number-in-buf): Update for above name change.
(emerge-combine-versions-internal): Rename local `template' to
emerge-combine-template.
(emerge-combine-versions-edit): Update for above name change.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 06 Nov 2010 11:51:11 -0700 |
| parents | 898b96cf89b3 |
| children | 2eee976277c5 |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Nov 06 20:19:32 2010 +0200 +++ b/lisp/ChangeLog Sat Nov 06 11:51:11 2010 -0700 @@ -1,3 +1,14 @@ +2010-11-06 Glenn Morris <rgm@gnu.org> + + * vc/emerge.el (emerge-eval-in-buffer): Remove, and replace all uses + with with-current-buffer. + (diff, template): Give dynamic local variables a prefix. + (emerge-line-numbers): Rename local `diff' to emerge-line-diff. + (emerge-line-number-in-buf): Update for above name change. + (emerge-combine-versions-internal): Rename local `template' to + emerge-combine-template. + (emerge-combine-versions-edit): Update for above name change. + 2010-11-06 Ralf Angeli <angeli@caeruleus.net> * textmodes/reftex-cite.el