From e6cf6ca050891610596a559a2fb707570c4c1fe5 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 2 May 2014 22:27:46 -0400 Subject: [PATCH] * 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 --- lisp/ChangeLog | 10 ++++++++++ lisp/vc/ediff-diff.el | 5 ++--- lisp/vc/ediff-init.el | 2 +- lisp/vc/ediff-util.el | 6 +++--- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9edc7641c74..b16c370e4e4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2014-05-03 Stefan Monnier + + * 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 * calendar/todo-mode.el (todo-edit-file): Use display-warning. diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index ed248fbf835..d21b4cc6d0b 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el @@ -818,10 +818,9 @@ one optional arguments, diff-number to refine.") n &optional default) (let ((fine-diff-vector (ediff-get-fine-diff-vector n buf-type)) (face (if default - 'default + nil (ediff-get-symbol-from-alist - buf-type ediff-fine-diff-face-alist) - ))) + buf-type ediff-fine-diff-face-alist)))) (mapc (lambda (overl) (ediff-set-overlay-face overl face)) fine-diff-vector))) diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index f3781c53885..dd0d76485bf 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -807,7 +807,7 @@ TYPE-OF-EMACS is either 'xemacs or 'emacs." (defun ediff-set-overlay-face (extent 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) (unless overlay diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 649ef884059..dbf52479527 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -958,7 +958,7 @@ On a dumb terminal, switches between ASCII highlighting and no highlighting." (message "Auto-refining is OFF") (setq ediff-auto-refine 'off)) (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") (setq ediff-auto-refine 'nix)) )) @@ -2973,7 +2973,7 @@ Hit \\[ediff-recenter] to reset the windows afterward." )) ;; 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)))) @@ -3492,7 +3492,7 @@ Ediff Control Panel to restore highlighting." (if (ediff-valid-difference-p ediff-current-difference) (progn - (ediff-set-fine-diff-properties ediff-current-difference 'default) + (ediff-set-fine-diff-properties ediff-current-difference t) (ediff-unhighlight-diff))) (ediff-paint-background-regions 'unhighlight) -- 2.39.5