/[emacs]/emacs/lisp/ediff-util.el
ViewVC logotype

Diff of /emacs/lisp/ediff-util.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.38 by kifer, Sat Jul 21 05:28:24 2001 UTC revision 1.39 by kifer, Mon Dec 24 05:50:31 2001 UTC
# Line 40  Line 40 
40  (defvar mark-active)  (defvar mark-active)
41  (defvar ediff-emacs-p)  (defvar ediff-emacs-p)
42    
43    (defvar ediff-after-quit-hook-internal nil)
44    
45  (eval-when-compile  (eval-when-compile
46    (let ((load-path (cons (expand-file-name ".") load-path)))    (let ((load-path (cons (expand-file-name ".") load-path)))
47      (or (featurep 'ediff-init)      (or (featurep 'ediff-init)
# Line 294  to invocation.") Line 296  to invocation.")
296        (make-local-variable 'ediff-window-setup-function)        (make-local-variable 'ediff-window-setup-function)
297        (make-local-variable 'ediff-keep-variants)        (make-local-variable 'ediff-keep-variants)
298    
       (make-local-hook 'ediff-after-quit-hook-internal)  
         
299        ;; unwrap set up parameters passed as argument        ;; unwrap set up parameters passed as argument
300        (while setup-parameters        (while setup-parameters
301          (set (car (car setup-parameters)) (cdr (car setup-parameters)))          (set (car (car setup-parameters)) (cdr (car setup-parameters)))
# Line 317  to invocation.") Line 317  to invocation.")
317        (if (string-match "buffer" (symbol-name ediff-job-name))        (if (string-match "buffer" (symbol-name ediff-job-name))
318            (setq ediff-keep-variants t))            (setq ediff-keep-variants t))
319    
320        (make-local-hook 'pre-command-hook)        (if ediff-xemacs-p
321              (make-local-hook 'pre-command-hook))
322    
323        (if (ediff-window-display-p)        (if (ediff-window-display-p)
324            (add-hook 'pre-command-hook 'ediff-spy-after-mouse nil t))            (add-hook 'pre-command-hook 'ediff-spy-after-mouse nil 'local))
325        (setq ediff-mouse-pixel-position (mouse-pixel-position))        (setq ediff-mouse-pixel-position (mouse-pixel-position))
326                
327        ;; adjust for merge jobs        ;; adjust for merge jobs
# Line 3845  Mail anyway? (y or n) ") Line 3847  Mail anyway? (y or n) ")
3847    "Toggle profiling Ediff commands."    "Toggle profiling Ediff commands."
3848    (interactive)    (interactive)
3849    (ediff-barf-if-not-control-buffer)    (ediff-barf-if-not-control-buffer)
3850    (make-local-hook 'post-command-hook)  
3851      (if ediff-xemacs-p
3852          (make-local-hook 'post-command-hook))
3853    
3854    (let ((pre-hook 'pre-command-hook)    (let ((pre-hook 'pre-command-hook)
3855          (post-hook 'post-command-hook))          (post-hook 'post-command-hook))
3856      (if (not (equal ediff-command-begin-time '(0 0 0)))      (if (not (equal ediff-command-begin-time '(0 0 0)))
# Line 3853  Mail anyway? (y or n) ") Line 3858  Mail anyway? (y or n) ")
3858                 (remove-hook post-hook 'ediff-calc-command-time)                 (remove-hook post-hook 'ediff-calc-command-time)
3859                 (setq ediff-command-begin-time '(0 0 0))                 (setq ediff-command-begin-time '(0 0 0))
3860                 (message "Ediff profiling disabled"))                 (message "Ediff profiling disabled"))
3861        (add-hook pre-hook 'ediff-save-time t t)        (add-hook pre-hook 'ediff-save-time t 'local)
3862        (add-hook post-hook 'ediff-calc-command-time nil t)        (add-hook post-hook 'ediff-calc-command-time nil 'local)
3863        (message "Ediff profiling enabled"))))        (message "Ediff profiling enabled"))))
3864            
3865  (defun ediff-print-diff-vector (diff-vector-var)  (defun ediff-print-diff-vector (diff-vector-var)

Legend:
Removed from v.1.38  
changed lines
  Added in v.1.39

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26