Commit e6cf6ca0 authored by Stefan Monnier's avatar Stefan Monnier

* 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
parent 283d38ed
2014-05-03 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):
Use nil rather than `default' for the "default" appearance (bug#17388).
* 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.
* vc/ediff-init.el (ediff-set-overlay-face): Don't set help-echo if the
overlay is not visible.
2014-05-02 Stephen Berman <stephen.berman@gmx.net> 2014-05-02 Stephen Berman <stephen.berman@gmx.net>
* calendar/todo-mode.el (todo-edit-file): Use display-warning. * calendar/todo-mode.el (todo-edit-file): Use display-warning.
......
...@@ -818,10 +818,9 @@ one optional arguments, diff-number to refine.") ...@@ -818,10 +818,9 @@ one optional arguments, diff-number to refine.")
n &optional default) n &optional default)
(let ((fine-diff-vector (ediff-get-fine-diff-vector n buf-type)) (let ((fine-diff-vector (ediff-get-fine-diff-vector n buf-type))
(face (if default (face (if default
'default nil
(ediff-get-symbol-from-alist (ediff-get-symbol-from-alist
buf-type ediff-fine-diff-face-alist) buf-type ediff-fine-diff-face-alist))))
)))
(mapc (lambda (overl) (mapc (lambda (overl)
(ediff-set-overlay-face overl face)) (ediff-set-overlay-face overl face))
fine-diff-vector))) fine-diff-vector)))
......
...@@ -807,7 +807,7 @@ TYPE-OF-EMACS is either 'xemacs or 'emacs." ...@@ -807,7 +807,7 @@ TYPE-OF-EMACS is either 'xemacs or 'emacs."
(defun ediff-set-overlay-face (extent face) (defun ediff-set-overlay-face (extent face)
(ediff-overlay-put extent 'face face) (ediff-overlay-put extent 'face face)
(ediff-overlay-put extent 'help-echo 'ediff-region-help-echo)) (ediff-overlay-put extent 'help-echo (if face 'ediff-region-help-echo)))
(defun ediff-region-help-echo (extent-or-window &optional overlay _point) (defun ediff-region-help-echo (extent-or-window &optional overlay _point)
(unless overlay (unless overlay
......
...@@ -958,7 +958,7 @@ On a dumb terminal, switches between ASCII highlighting and no highlighting." ...@@ -958,7 +958,7 @@ On a dumb terminal, switches between ASCII highlighting and no highlighting."
(message "Auto-refining is OFF") (message "Auto-refining is OFF")
(setq ediff-auto-refine 'off)) (setq ediff-auto-refine 'off))
(t ;; nix 'em (t ;; nix 'em
(ediff-set-fine-diff-properties ediff-current-difference 'default) (ediff-set-fine-diff-properties ediff-current-difference t)
(message "Refinements are HIDDEN") (message "Refinements are HIDDEN")
(setq ediff-auto-refine 'nix)) (setq ediff-auto-refine 'nix))
)) ))
...@@ -2973,7 +2973,7 @@ Hit \\[ediff-recenter] to reset the windows afterward." ...@@ -2973,7 +2973,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
)) ))
;; unhighlight fine diffs ;; unhighlight fine diffs
(ediff-set-fine-diff-properties ediff-current-difference 'default) (ediff-set-fine-diff-properties ediff-current-difference t)
(run-hooks 'ediff-unselect-hook)))) (run-hooks 'ediff-unselect-hook))))
...@@ -3492,7 +3492,7 @@ Ediff Control Panel to restore highlighting." ...@@ -3492,7 +3492,7 @@ Ediff Control Panel to restore highlighting."
(if (ediff-valid-difference-p ediff-current-difference) (if (ediff-valid-difference-p ediff-current-difference)
(progn (progn
(ediff-set-fine-diff-properties ediff-current-difference 'default) (ediff-set-fine-diff-properties ediff-current-difference t)
(ediff-unhighlight-diff))) (ediff-unhighlight-diff)))
(ediff-paint-background-regions 'unhighlight) (ediff-paint-background-regions 'unhighlight)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment