diff options
| author | Dave Abrahams | 2012-12-14 10:22:24 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2012-12-14 10:22:24 -0500 |
| commit | 665e5e07a99173d6b310bb7234a3bd0d774d107d (patch) | |
| tree | 82a2f6f6e9f6a418f2ebc6419a5e0dca87ebdd67 /lisp/ChangeLog | |
| parent | d72e9e922fb914a946e104ad2128f57c983ab75d (diff) | |
| download | emacs-665e5e07a99173d6b310bb7234a3bd0d774d107d.tar.gz emacs-665e5e07a99173d6b310bb7234a3bd0d774d107d.zip | |
* lisp/vc/ediff-util.el (ediff-buffer-type): New function.
(ediff-clone-buffer-for-current-diff-comparison): Compute the buf-type
rather than taking it as as argument.
(ediff-inferior-compare-regions): Adjust calls accordingly.
Fixes: debbugs:11319
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 97b3a6608ad..61ccbead17d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2012-12-14 Dave Abrahams <dave@boostpro.com> | ||
| 2 | |||
| 3 | * vc/ediff-util.el (ediff-buffer-type): New function. | ||
| 4 | (ediff-clone-buffer-for-current-diff-comparison): Compute the buf-type | ||
| 5 | rather than taking it as as argument. | ||
| 6 | (ediff-inferior-compare-regions): Adjust calls accordingly (bug#11319). | ||
| 7 | |||
| 1 | 2012-12-14 Ryan Crum <ryan.crum@eleostech.com> | 8 | 2012-12-14 Ryan Crum <ryan.crum@eleostech.com> |
| 2 | 9 | ||
| 3 | * json.el: Add pretty-print option (bug#12634). | 10 | * json.el: Add pretty-print option (bug#12634). |