diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2001-12-24 05:50:31 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2001-12-24 05:50:31 +0000 |
| commit | b9fe4732f60bef14008aa9c4735d45f23fd8f670 (patch) | |
| tree | a1143820e91e6ead088b0b85b24f9388cceace95 /lisp/ediff-util.el | |
| parent | ea8d3061370eb3c02cc659eb0b013a358de853b2 (diff) | |
| download | emacs-b9fe4732f60bef14008aa9c4735d45f23fd8f670.tar.gz | |
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
* viper-cmd.el (viper-change-state): Got rid of make-local-hook.
(viper-special-read-and-insert-char): Make C-m work right in the r
comand.
(viper-buffer-search-enable): Fixed format string.
* viper-ex.el (ex-token-alist): Use ex-set-visited-file-name
instead of viper-info-on-file.
(ex-set-visited-file-name): New function.
* viper.el (viper-emacs-state-mode-list): Added mail-mode.
* ediff-mult.el (ediff-meta-mark-equal-files): Added optional
action argument.
* ediff-init.el: Fixed some doc strings.
* ediff-util.el (ediff-after-quit-hook-internal): New variable.
Got rid of make-local-hook.
* ediff-wind.el (ediff-setup-control-frame): Got rid of
make-local-hook.
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 8d0f7395149..22925c1fc03 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -40,6 +40,8 @@ (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,8 +296,6 @@ to invocation.") (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))) @@ -317,9 +317,11 @@ to invocation.") (if (string-match "buffer" (symbol-name ediff-job-name)) (setq ediff-keep-variants t)) - (make-local-hook 'pre-command-hook) + (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 t)) + (add-hook 'pre-command-hook 'ediff-spy-after-mouse nil 'local)) (setq ediff-mouse-pixel-position (mouse-pixel-position)) ;; adjust for merge jobs @@ -3845,7 +3847,10 @@ Mail anyway? (y or n) ") "Toggle profiling Ediff commands." (interactive) (ediff-barf-if-not-control-buffer) - (make-local-hook 'post-command-hook) + + (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,8 +3858,8 @@ Mail anyway? (y or n) ") (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) + (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) |