900 |
|
|
901 |
(ediff-with-current-buffer ctl-buffer |
(ediff-with-current-buffer ctl-buffer |
902 |
(ediff-cond-compile-for-xemacs-or-emacs |
(ediff-cond-compile-for-xemacs-or-emacs |
903 |
(set-buffer-menubar nil) ; xemacs |
(when (featurep 'menubar) (set-buffer-menubar nil)) ; xemacs |
904 |
nil ; emacs |
nil ; emacs |
905 |
) |
) |
906 |
;;(setq user-grabbed-mouse (ediff-user-grabbed-mouse)) |
;;(setq user-grabbed-mouse (ediff-user-grabbed-mouse)) |
1054 |
(if (and (ediff-window-display-p) (frame-live-p ediff-control-frame)) |
(if (and (ediff-window-display-p) (frame-live-p ediff-control-frame)) |
1055 |
(let ((ctl-frame ediff-control-frame)) |
(let ((ctl-frame ediff-control-frame)) |
1056 |
(ediff-cond-compile-for-xemacs-or-emacs |
(ediff-cond-compile-for-xemacs-or-emacs |
1057 |
(set-buffer-menubar default-menubar) ; xemacs |
(when (featurep 'menubar) |
1058 |
|
(set-buffer-menubar default-menubar)) ; xemacs |
1059 |
nil ; emacs |
nil ; emacs |
1060 |
) |
) |
1061 |
(setq ediff-control-frame nil) |
(setq ediff-control-frame nil) |