Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-hook.el @ 12:bcdc7deadc19 r19-15b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b7
author cvs
date Mon, 13 Aug 2007 08:48:16 +0200
parents 376386a54a3c
children 9ee227acff29
comparison
equal deleted inserted replaced
11:91ffe8bd52e4 12:bcdc7deadc19
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
126 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)) 141 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
127 142
128 ;; define ediff-menu 143 ;; define ediff-menu
129 (define-key menu-bar-ediff-menu [ediff-doc] 144 (define-key menu-bar-ediff-menu [ediff-doc]
130 '("Ediff Manual..." . ediff-documentation)) 145 '("Ediff Manual..." . ediff-documentation))
146 (define-key menu-bar-ediff-menu [emultiframe]
147 '("Toggle separate control buffer frame..."
148 . ediff-toggle-multiframe))
131 (define-key menu-bar-ediff-menu [eregistry] 149 (define-key menu-bar-ediff-menu [eregistry]
132 '("List Ediff Sessions..." . ediff-show-registry)) 150 '("List Ediff Sessions..." . ediff-show-registry))
133 (define-key menu-bar-ediff-menu [separator-ediff-manual] '("--")) 151 (define-key menu-bar-ediff-menu [separator-ediff-manual] '("--"))
134 (define-key menu-bar-ediff-menu [window] 152 (define-key menu-bar-ediff-menu [window]
135 '("This Window and Next Window" . compare-windows)) 153 '("This Window and Next Window" . compare-windows))
163 '("Two Files..." . ediff-files)) 181 '("Two Files..." . ediff-files))
164 182
165 ;; define merge menu 183 ;; define merge menu
166 (define-key menu-bar-ediff-merge-menu [ediff-doc2] 184 (define-key menu-bar-ediff-merge-menu [ediff-doc2]
167 '("Ediff Manual..." . ediff-documentation)) 185 '("Ediff Manual..." . ediff-documentation))
186 (define-key menu-bar-ediff-merge-menu [emultiframe2]
187 '("Toggle separate control buffer frame..."
188 . ediff-toggle-multiframe))
168 (define-key menu-bar-ediff-merge-menu [eregistry2] 189 (define-key menu-bar-ediff-merge-menu [eregistry2]
169 '("List Ediff Sessions..." . ediff-show-registry)) 190 '("List Ediff Sessions..." . ediff-show-registry))
170 (define-key 191 (define-key
171 menu-bar-ediff-merge-menu [separator-ediff-merge-manual] '("--")) 192 menu-bar-ediff-merge-menu [separator-ediff-merge-manual] '("--"))
172 (define-key 193 (define-key
202 '("Files..." . ediff-merge-files)) 223 '("Files..." . ediff-merge-files))
203 224
204 ;; define epatch menu 225 ;; define epatch menu
205 (define-key menu-bar-epatch-menu [ediff-doc3] 226 (define-key menu-bar-epatch-menu [ediff-doc3]
206 '("Ediff Manual..." . ediff-documentation)) 227 '("Ediff Manual..." . ediff-documentation))
228 (define-key menu-bar-epatch-menu [emultiframe3]
229 '("Toggle separate control buffer frame..."
230 . ediff-toggle-multiframe))
207 (define-key menu-bar-epatch-menu [eregistry3] 231 (define-key menu-bar-epatch-menu [eregistry3]
208 '("List Ediff Sessions..." . ediff-show-registry)) 232 '("List Ediff Sessions..." . ediff-show-registry))
209 (define-key menu-bar-epatch-menu [separator-epatch] '("--")) 233 (define-key menu-bar-epatch-menu [separator-epatch] '("--"))
210 (define-key menu-bar-epatch-menu [ediff-patch-buffer] 234 (define-key menu-bar-epatch-menu [ediff-patch-buffer]
211 '("To a Buffer..." . ediff-patch-buffer)) 235 '("To a Buffer..." . ediff-patch-buffer))
212 (define-key menu-bar-epatch-menu [ediff-patch-file] 236 (define-key menu-bar-epatch-menu [ediff-patch-file]
213 '("To a File..." . ediff-patch-file))) 237 '("To a File..." . ediff-patch-file)))
297 "Merge versions of files in a directory using other versions as ancestors." 321 "Merge versions of files in a directory using other versions as ancestors."
298 t) 322 t)
299 323
300 ;; misc 324 ;; misc
301 (autoload 'ediff-show-registry 325 (autoload 'ediff-show-registry
302 "ediff-meta" 326 "ediff-mult"
303 "Display the registry of active Ediff sessions." 327 "Display the registry of active Ediff sessions."
304 t) 328 t)
305 (autoload 'ediff-documentation 329 (autoload 'ediff-documentation
306 "ediff" 330 "ediff"
307 "Display Ediff's manual." 331 "Display Ediff's manual."
308 t) 332 t)
309 (autoload 'ediff-version 333 (autoload 'ediff-version
310 "ediff" 334 "ediff"
311 "Show Ediff's version and last modification date." 335 "Show Ediff's version and last modification date."
312 t) 336 t)
337 (autoload 'ediff-toggle-multiframe
338 "ediff-util"
339 "Toggle the use of separate frame for Ediff control buffer."
340 t)
341 ;;(if (string-match "XEmacs" emacs-version)
342 ;; (autoload 'ediff-toggle-use-toolbar
343 ;; "ediff-tbar"
344 ;; "Toggle the use of Ediff toolbar."
345 ;; t))
313 ) ; if purify-flag 346 ) ; if purify-flag
314 347
315 348
316 (provide 'ediff-hook) 349 (provide 'ediff-hook)
317 350