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-wind.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-wind.el')
| -rw-r--r-- | lisp/ediff-wind.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index 1a18bead505..4a0928997bd 100644 --- a/lisp/ediff-wind.el +++ b/lisp/ediff-wind.el @@ -1018,8 +1018,10 @@ into icons, regardless of the window manager." (if ediff-xemacs-p (ediff-with-current-buffer ctl-buffer - (make-local-hook 'select-frame-hook) - (add-hook 'select-frame-hook 'ediff-xemacs-select-frame-hook nil t) + (if ediff-xemacs-p + (make-local-hook 'select-frame-hook)) + (add-hook + 'select-frame-hook 'ediff-xemacs-select-frame-hook nil 'local) )) (ediff-with-current-buffer ctl-buffer |