diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 1996-12-28 02:53:04 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 1996-12-28 02:53:04 +0000 |
| commit | bf5d92c5e3c9eccf0adbf150c70bc4e656c7aa01 (patch) | |
| tree | 710e2d34c85a2982384a996efb2ccffb6d523843 /lisp/ediff-hook.el | |
| parent | 469b44cbf1916dc9502d4356e8fce0081809f585 (diff) | |
| download | emacs-bf5d92c5e3c9eccf0adbf150c70bc4e656c7aa01.tar.gz | |
*** empty log message ***
Diffstat (limited to 'lisp/ediff-hook.el')
| -rw-r--r-- | lisp/ediff-hook.el | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el index 0b9dc1fb61c..25c5afc1d8b 100644 --- a/lisp/ediff-hook.el +++ b/lisp/ediff-hook.el @@ -38,9 +38,24 @@ (defvar epatch-menu) ;; end pacifier + (defun ediff-xemacs-init-menus () (if (featurep 'menubar) (progn + (add-menu-button + '("Tools") + ["Use separate frame for Ediff control buffer" + ediff-toggle-multiframe + :style toggle + :selected (eq ediff-window-setup-function 'ediff-setup-windows-multiframe)] + "00-Browser...") + (add-menu-button + '("Tools") + ["Use a toolbar with Ediff control buffer" + ediff-menu-toggle-use-toolbar + :style toggle + :selected (ediff-use-toolbar-p)] + "00-Browser...") (add-submenu '("Tools") ediff-menu "OO-Browser...") (add-submenu @@ -128,6 +143,9 @@ ;; define ediff-menu (define-key menu-bar-ediff-menu [ediff-doc] '("Ediff Manual..." . ediff-documentation)) + (define-key menu-bar-ediff-menu [emultiframe] + '("Toggle separate control buffer frame..." + . ediff-toggle-multiframe)) (define-key menu-bar-ediff-menu [eregistry] '("List Ediff Sessions..." . ediff-show-registry)) (define-key menu-bar-ediff-menu [separator-ediff-manual] '("--")) @@ -165,6 +183,9 @@ ;; define merge menu (define-key menu-bar-ediff-merge-menu [ediff-doc2] '("Ediff Manual..." . ediff-documentation)) + (define-key menu-bar-ediff-merge-menu [emultiframe2] + '("Toggle separate control buffer frame..." + . ediff-toggle-multiframe)) (define-key menu-bar-ediff-merge-menu [eregistry2] '("List Ediff Sessions..." . ediff-show-registry)) (define-key @@ -204,6 +225,9 @@ ;; define epatch menu (define-key menu-bar-epatch-menu [ediff-doc3] '("Ediff Manual..." . ediff-documentation)) + (define-key menu-bar-epatch-menu [emultiframe3] + '("Toggle separate control buffer frame..." + . ediff-toggle-multiframe)) (define-key menu-bar-epatch-menu [eregistry3] '("List Ediff Sessions..." . ediff-show-registry)) (define-key menu-bar-epatch-menu [separator-epatch] '("--")) @@ -310,6 +334,15 @@ "ediff" "Show Ediff's version and last modification date." t) + (autoload 'ediff-toggle-multiframe + "ediff-util" + "Toggle the use of separate frame for Ediff control buffer." + t) + (if (string-match "XEmacs" emacs-version) + (autoload 'ediff-toggle-use-toolbar + "ediff-tbar" + "Toggle the use of Ediff toolbar." + t)) ) ; if purify-flag |