Mercurial > emacs

diff lisp/ediff-wind.el @ 42288:3ce98f3e0608

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Michael Kifer <kifer@cs.stonybrook.edu>
date Mon, 24 Dec 2001 05:50:31 +0000
parents 7a94f1c588c4
children 633233bf2bbf
line wrap: on
line diff
--- a/lisp/ediff-wind.el	Mon Dec 24 04:52:54 2001 +0000
+++ b/lisp/ediff-wind.el	Mon Dec 24 05:50:31 2001 +0000
@@ -1018,8 +1018,10 @@
 	
     (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