Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-hook.el @ 78:c7528f8e288d r20-0b34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b34
author cvs
date Mon, 13 Aug 2007 09:05:42 +0200
parents 131b0175ea99
children 1ce6082ce73f
comparison
equal deleted inserted replaced
77:6cb4f478e7bc 78:c7528f8e288d
36 (defvar ediff-menu) 36 (defvar ediff-menu)
37 (defvar ediff-merge-menu) 37 (defvar ediff-merge-menu)
38 (defvar epatch-menu) 38 (defvar epatch-menu)
39 ;; end pacifier 39 ;; end pacifier
40 40
41
41 (defun ediff-xemacs-init-menus () 42 (defun ediff-xemacs-init-menus ()
42 (if (featurep 'menubar) 43 (if (featurep 'menubar)
43 (progn 44 (progn
45 ;; (add-menu-button
46 ;; '("Tools")
47 ;; ["Use separate frame for Ediff control buffer"
48 ;; ediff-toggle-multiframe
49 ;; :style toggle
50 ;; :selected (eq ediff-window-setup-function 'ediff-setup-windows-multiframe)]
51 ;; "00-Browser...")
52 ;; (add-menu-button
53 ;; '("Tools")
54 ;; ["Use a toolbar with Ediff control buffer"
55 ;; ediff-menu-toggle-use-toolbar
56 ;; :style toggle
57 ;; :selected (ediff-use-toolbar-p)]
58 ;; "00-Browser...")
44 (add-submenu 59 (add-submenu
45 '("Tools") ediff-menu "OO-Browser...") 60 '("Tools") ediff-menu "OO-Browser...")
46 (add-submenu 61 (add-submenu
47 '("Tools") ediff-merge-menu "OO-Browser...") 62 '("Tools") ediff-merge-menu "OO-Browser...")
48 (add-submenu 63 (add-submenu
125 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)) 140 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
126 141
127 ;; define ediff-menu 142 ;; define ediff-menu
128 (define-key menu-bar-ediff-menu [ediff-doc] 143 (define-key menu-bar-ediff-menu [ediff-doc]
129 '("Ediff Manual..." . ediff-documentation)) 144 '("Ediff Manual..." . ediff-documentation))
145 (define-key menu-bar-ediff-menu [emultiframe]
146 '("Toggle separate control buffer frame..."
147 . ediff-toggle-multiframe))
130 (define-key menu-bar-ediff-menu [eregistry] 148 (define-key menu-bar-ediff-menu [eregistry]
131 '("List Ediff Sessions..." . ediff-show-registry)) 149 '("List Ediff Sessions..." . ediff-show-registry))
132 (define-key menu-bar-ediff-menu [separator-ediff-manual] '("--")) 150 (define-key menu-bar-ediff-menu [separator-ediff-manual] '("--"))
133 (define-key menu-bar-ediff-menu [window] 151 (define-key menu-bar-ediff-menu [window]
134 '("This Window and Next Window" . compare-windows)) 152 '("This Window and Next Window" . compare-windows))
162 '("Two Files..." . ediff-files)) 180 '("Two Files..." . ediff-files))
163 181
164 ;; define merge menu 182 ;; define merge menu
165 (define-key menu-bar-ediff-merge-menu [ediff-doc2] 183 (define-key menu-bar-ediff-merge-menu [ediff-doc2]
166 '("Ediff Manual..." . ediff-documentation)) 184 '("Ediff Manual..." . ediff-documentation))
185 (define-key menu-bar-ediff-merge-menu [emultiframe2]
186 '("Toggle separate control buffer frame..."
187 . ediff-toggle-multiframe))
167 (define-key menu-bar-ediff-merge-menu [eregistry2] 188 (define-key menu-bar-ediff-merge-menu [eregistry2]
168 '("List Ediff Sessions..." . ediff-show-registry)) 189 '("List Ediff Sessions..." . ediff-show-registry))
169 (define-key 190 (define-key
170 menu-bar-ediff-merge-menu [separator-ediff-merge-manual] '("--")) 191 menu-bar-ediff-merge-menu [separator-ediff-merge-manual] '("--"))
171 (define-key 192 (define-key
201 '("Files..." . ediff-merge-files)) 222 '("Files..." . ediff-merge-files))
202 223
203 ;; define epatch menu 224 ;; define epatch menu
204 (define-key menu-bar-epatch-menu [ediff-doc3] 225 (define-key menu-bar-epatch-menu [ediff-doc3]
205 '("Ediff Manual..." . ediff-documentation)) 226 '("Ediff Manual..." . ediff-documentation))
227 (define-key menu-bar-epatch-menu [emultiframe3]
228 '("Toggle separate control buffer frame..."
229 . ediff-toggle-multiframe))
206 (define-key menu-bar-epatch-menu [eregistry3] 230 (define-key menu-bar-epatch-menu [eregistry3]
207 '("List Ediff Sessions..." . ediff-show-registry)) 231 '("List Ediff Sessions..." . ediff-show-registry))
208 (define-key menu-bar-epatch-menu [separator-epatch] '("--")) 232 (define-key menu-bar-epatch-menu [separator-epatch] '("--"))
209 (define-key menu-bar-epatch-menu [ediff-patch-buffer] 233 (define-key menu-bar-epatch-menu [ediff-patch-buffer]
210 '("To a Buffer..." . ediff-patch-buffer)) 234 '("To a Buffer..." . ediff-patch-buffer))
211 (define-key menu-bar-epatch-menu [ediff-patch-file] 235 (define-key menu-bar-epatch-menu [ediff-patch-file]
212 '("To a File..." . ediff-patch-file))) 236 '("To a File..." . ediff-patch-file)))
296 "Merge versions of files in a directory using other versions as ancestors." 320 "Merge versions of files in a directory using other versions as ancestors."
297 t) 321 t)
298 322
299 ;; misc 323 ;; misc
300 (autoload 'ediff-show-registry 324 (autoload 'ediff-show-registry
301 "ediff-meta" 325 "ediff-mult"
302 "Display the registry of active Ediff sessions." 326 "Display the registry of active Ediff sessions."
303 t) 327 t)
304 (autoload 'ediff-documentation 328 (autoload 'ediff-documentation
305 "ediff" 329 "ediff"
306 "Display Ediff's manual." 330 "Display Ediff's manual."
307 t) 331 t)
308 (autoload 'ediff-version 332 (autoload 'ediff-version
309 "ediff" 333 "ediff"
310 "Show Ediff's version and last modification date." 334 "Show Ediff's version and last modification date."
311 t) 335 t)
336 (autoload 'ediff-toggle-multiframe
337 "ediff-util"
338 "Toggle the use of separate frame for Ediff control buffer."
339 t)
340 ;;(if (string-match "XEmacs" emacs-version)
341 ;; (autoload 'ediff-toggle-use-toolbar
342 ;; "ediff-tbar"
343 ;; "Toggle the use of Ediff toolbar."
344 ;; t))
312 ) ; if purify-flag 345 ) ; if purify-flag
313 346
314 347
315 (provide 'ediff-hook) 348 (provide 'ediff-hook)
316 349