[Emacs-diffs] Changes to emacs/lisp/ediff-util.el

[Michael Kifer]

Index: emacs/lisp/ediff-util.el
diff -c emacs/lisp/ediff-util.el:1.50 emacs/lisp/ediff-util.el:1.51
*** emacs/lisp/ediff-util.el:1.50       Mon Sep  1 11:45:11 2003
--- emacs/lisp/ediff-util.el    Sun Oct 12 21:28:49 2003
***************
*** 826,832 ****
                 (eq this-command 'ediff-quit))))
          ))
  
!     (ediff-restore-highlighting)
      (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines))
      ))
  
--- 826,833 ----
                 (eq this-command 'ediff-quit))))
          ))
  
!     (or no-rehighlight
!       (ediff-restore-highlighting))
      (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines))
      ))
  
***************
*** 2940,2945 ****
--- 2941,2948 ----
             ))
  
        (ediff-install-fine-diff-if-necessary n)
+       ;; set current difference here so the hook will be able to refer to it
+       (setq ediff-current-difference n)
        (run-hooks 'ediff-select-hook))))
  
  
***************
*** 2991,2996 ****
--- 2994,3002 ----
  
          (or (eq flag 'unselect-only)
              (ediff-select-difference n))
+         ;; need to set current diff here even though it is also set in
+         ;; ediff-select-difference because ediff-select-difference might not
+         ;; be called if unselect-only is specified
          (setq ediff-current-difference n)
          ) ; end protected section