[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.38 emacs/lisp/ediff-util.el:1.39
*** emacs/lisp/ediff-util.el:1.38       Sat Jul 21 01:28:24 2001
--- emacs/lisp/ediff-util.el    Mon Dec 24 00:50:31 2001
***************
*** 40,45 ****
--- 40,47 ----
  (defvar mark-active)
  (defvar ediff-emacs-p)
  
+ (defvar ediff-after-quit-hook-internal nil)
+ 
  (eval-when-compile
    (let ((load-path (cons (expand-file-name ".") load-path)))
      (or (featurep 'ediff-init)
***************
*** 294,301 ****
        (make-local-variable 'ediff-window-setup-function)
        (make-local-variable 'ediff-keep-variants)
  
-       (make-local-hook 'ediff-after-quit-hook-internal)
-       
        ;; unwrap set up parameters passed as argument
        (while setup-parameters
        (set (car (car setup-parameters)) (cdr (car setup-parameters)))
--- 296,301 ----
***************
*** 317,325 ****
        (if (string-match "buffer" (symbol-name ediff-job-name))
          (setq ediff-keep-variants t))
  
!       (make-local-hook 'pre-command-hook)
        (if (ediff-window-display-p)
!         (add-hook 'pre-command-hook 'ediff-spy-after-mouse nil t))
        (setq ediff-mouse-pixel-position (mouse-pixel-position))
        
        ;; adjust for merge jobs
--- 317,327 ----
        (if (string-match "buffer" (symbol-name ediff-job-name))
          (setq ediff-keep-variants t))
  
!       (if ediff-xemacs-p
!         (make-local-hook 'pre-command-hook))
! 
        (if (ediff-window-display-p)
!         (add-hook 'pre-command-hook 'ediff-spy-after-mouse nil 'local))
        (setq ediff-mouse-pixel-position (mouse-pixel-position))
        
        ;; adjust for merge jobs
***************
*** 3845,3851 ****
    "Toggle profiling Ediff commands."
    (interactive)
    (ediff-barf-if-not-control-buffer)
!   (make-local-hook 'post-command-hook)
    (let ((pre-hook 'pre-command-hook)
        (post-hook 'post-command-hook))
      (if (not (equal ediff-command-begin-time '(0 0 0)))
--- 3847,3856 ----
    "Toggle profiling Ediff commands."
    (interactive)
    (ediff-barf-if-not-control-buffer)
! 
!   (if ediff-xemacs-p
!       (make-local-hook 'post-command-hook))
! 
    (let ((pre-hook 'pre-command-hook)
        (post-hook 'post-command-hook))
      (if (not (equal ediff-command-begin-time '(0 0 0)))
***************
*** 3853,3860 ****
               (remove-hook post-hook 'ediff-calc-command-time)
               (setq ediff-command-begin-time '(0 0 0))
               (message "Ediff profiling disabled"))
!       (add-hook pre-hook 'ediff-save-time t t)
!       (add-hook post-hook 'ediff-calc-command-time nil t)
        (message "Ediff profiling enabled"))))
      
  (defun ediff-print-diff-vector (diff-vector-var)
--- 3858,3865 ----
               (remove-hook post-hook 'ediff-calc-command-time)
               (setq ediff-command-begin-time '(0 0 0))
               (message "Ediff profiling disabled"))
!       (add-hook pre-hook 'ediff-save-time t 'local)
!       (add-hook post-hook 'ediff-calc-command-time nil 'local)
        (message "Ediff profiling enabled"))))
      
  (defun ediff-print-diff-vector (diff-vector-var)