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

[Miles Bader]

Index: emacs/lisp/ediff-util.el
diff -c emacs/lisp/ediff-util.el:1.44.2.1 emacs/lisp/ediff-util.el:1.44.2.2
*** emacs/lisp/ediff-util.el:1.44.2.1   Fri Apr  4 01:20:04 2003
--- emacs/lisp/ediff-util.el    Tue Oct 14 19:50:58 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))
      ))
  
***************
*** 2690,2696 ****
              ((eq ediff-autostore-merges t)
               ;; ask for file name
               (setq merge-store-file
!                    (read-file-name "Save the merge buffer in file: "))
               (ediff-write-merge-buffer-and-maybe-kill
                ediff-buffer-C merge-store-file nil save-and-continue))
              ((and (ediff-buffer-live-p ediff-meta-buffer)
--- 2691,2697 ----
              ((eq ediff-autostore-merges t)
               ;; ask for file name
               (setq merge-store-file
!                    (read-file-name "Save the result of the merge in file: "))
               (ediff-write-merge-buffer-and-maybe-kill
                ediff-buffer-C merge-store-file nil save-and-continue))
              ((and (ediff-buffer-live-p ediff-meta-buffer)
***************
*** 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
  
***************
*** 4286,4289 ****
--- 4292,4296 ----
  ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
  ;;; End:
  
+ ;;; arch-tag: f51099b6-ef4b-470f-88a1-3a0e0b03a879
  ;;; ediff-util.el ends here