[Emacs-diffs] emacs-24 r117052: * lisp/vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):

[Stefan Monnier]

------------------------------------------------------------
revno: 117052
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17388
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-05-02 22:27:46 -0400
message:
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/ediff-diff.el          
ediffdiff.el-20091113204419-o5vbwnq5f7feedwu-845
  lisp/vc/ediff-init.el          
ediffinit.el-20091113204419-o5vbwnq5f7feedwu-846
  lisp/vc/ediff-util.el          
ediffutil.el-20091113204419-o5vbwnq5f7feedwu-848

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-02 14:10:11 +0000
+++ b/lisp/ChangeLog    2014-05-03 02:27:46 +0000
@@ -1,3 +1,13 @@
+2014-05-03  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * calendar/todo-mode.el (todo-edit-file): Use display-warning.

=== modified file 'lisp/vc/ediff-diff.el'
--- a/lisp/vc/ediff-diff.el     2014-04-14 02:21:12 +0000
+++ b/lisp/vc/ediff-diff.el     2014-05-03 02:27:46 +0000
@@ -818,10 +818,9 @@
                                                     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)))

=== modified file 'lisp/vc/ediff-init.el'
--- a/lisp/vc/ediff-init.el     2014-04-10 19:15:01 +0000
+++ b/lisp/vc/ediff-init.el     2014-05-03 02:27:46 +0000
@@ -807,7 +807,7 @@
 
 (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

=== modified file 'lisp/vc/ediff-util.el'
--- a/lisp/vc/ediff-util.el     2014-04-10 19:15:01 +0000
+++ b/lisp/vc/ediff-util.el     2014-05-03 02:27:46 +0000
@@ -958,7 +958,7 @@
         (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 @@
               ))
 
        ;; 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 @@
 
     (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)