diff options
| author | Dave Abrahams <dave@boostpro.com> | 2012-12-14 10:22:24 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-12-14 10:22:24 -0500 |
| commit | 665e5e07a99173d6b310bb7234a3bd0d774d107d (patch) | |
| tree | 82a2f6f6e9f6a418f2ebc6419a5e0dca87ebdd67 /lisp/ChangeLog.15 | |
| parent | d72e9e922fb914a946e104ad2128f57c983ab75d (diff) | |
| download | emacs-665e5e07a99173d6b310bb7234a3bd0d774d107d.tar.gz | |
* 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.15')
| -rw-r--r-- | lisp/ChangeLog.15 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index b97cd80cdba..67801bfa20f 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 @@ -324,7 +324,7 @@ (ert-run-tests-batch, ert--print-test-for-ewoc): Handle `ert-test-quit'. -2011-03-03 David Abrahams <dave@boostpro.com> (tiny change) +2011-03-03 David Abrahams <dave@boostpro.com> * vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs): Move ediff-defvar-local calls after defcustoms. (Bug#1821) @@ -13597,7 +13597,7 @@ * textmodes/artist.el (artist-compute-popup-menu-table): Remove duplicated words in doc-strings. -2010-01-15 David Abrahams <dave@boostpro.com> (tiny change) +2010-01-15 David Abrahams <dave@boostpro.com> * net/mairix.el (mairix-widget-send-query): Send -1 instead of nil to mairix-search to suppress threading (Bug#5342). |