diff options
| author | Stefan Monnier | 2014-05-02 22:27:46 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-05-02 22:27:46 -0400 |
| commit | e6cf6ca050891610596a559a2fb707570c4c1fe5 (patch) | |
| tree | d9f8787a501e97d347e358a9bc8baac738d44951 /lisp/ChangeLog | |
| parent | 283d38edc96eb5e764ccc094d6affaef9e9d2c95 (diff) | |
| download | emacs-e6cf6ca050891610596a559a2fb707570c4c1fe5.tar.gz emacs-e6cf6ca050891610596a559a2fb707570c4c1fe5.zip | |
* lisp/vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):
Use nil rather than `default' for the "default" appearance.
* lisp/vc/ediff-util.el (ediff-inferior-compare-regions)
(ediff-toggle-autorefine, ediff-unselect-difference): Don't use
a misleading `default' value when it's really a boolean.
* lisp/vc/ediff-init.el (ediff-set-overlay-face): Don't set help-echo if the
overlay is not visible.
Fixes: debbugs:17388
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9edc7641c74..b16c370e4e4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2014-05-03 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): | ||
| 4 | Use nil rather than `default' for the "default" appearance (bug#17388). | ||
| 5 | * vc/ediff-util.el (ediff-inferior-compare-regions) | ||
| 6 | (ediff-toggle-autorefine, ediff-unselect-difference): Don't use | ||
| 7 | a misleading `default' value when it's really a boolean. | ||
| 8 | * vc/ediff-init.el (ediff-set-overlay-face): Don't set help-echo if the | ||
| 9 | overlay is not visible. | ||
| 10 | |||
| 1 | 2014-05-02 Stephen Berman <stephen.berman@gmx.net> | 11 | 2014-05-02 Stephen Berman <stephen.berman@gmx.net> |
| 2 | 12 | ||
| 3 | * calendar/todo-mode.el (todo-edit-file): Use display-warning. | 13 | * calendar/todo-mode.el (todo-edit-file): Use display-warning. |