code.delx.au - gnu-emacs/blob - lisp/ediff-hook.el

   1 ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
   2
   3 ;; Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
   4
   5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
   6
   7 ;; This file is part of GNU Emacs.
   8
   9 ;; GNU Emacs is free software; you can redistribute it and/or modify
  10 ;; it under the terms of the GNU General Public License as published by
  11 ;; the Free Software Foundation; either version 2, or (at your option)
  12 ;; any later version.
  13
  14 ;; GNU Emacs is distributed in the hope that it will be useful,
  15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
  16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  17 ;; GNU General Public License for more details.
  18
  19 ;; You should have received a copy of the GNU General Public License
  20 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
  21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  22 ;; Boston, MA 02111-1307, USA.
  23
  24 ;;; Code:
  25
  26 ;;;   These must be placed in menu-bar.el in Emacs
  27 ;;
  28 ;;      (define-key menu-bar-tools-menu [ediff-misc]
  29 ;;      '("Ediff Miscellanea" . menu-bar-ediff-misc-menu))
  30 ;;      (define-key menu-bar-tools-menu [epatch]
  31 ;;      '("Apply Patch" . menu-bar-epatch-menu))
  32 ;;      (define-key menu-bar-tools-menu [ediff-merge]
  33 ;;      '("Merge" . menu-bar-ediff-merge-menu))
  34 ;;      (define-key menu-bar-tools-menu [ediff]
  35 ;;      '("Compare" . menu-bar-ediff-menu))
  36
  37 ;; Compiler pacifier
  38 (defvar ediff-menu)
  39 (defvar ediff-merge-menu)
  40 (defvar epatch-menu)
  41 (defvar ediff-misc-menu)
  42 ;; end pacifier
  43
  44 ;; allow menus to be set up without ediff-wind.el being loaded
  45 (defvar ediff-window-setup-function)
  46
  47
  48 (defun ediff-xemacs-init-menus ()
  49   (if (featurep 'menubar)
  50       (progn
  51         (add-submenu
  52          '("Tools") ediff-menu "OO-Browser...")
  53         (add-submenu
  54          '("Tools") ediff-merge-menu "OO-Browser...")
  55         (add-submenu
  56          '("Tools") epatch-menu "OO-Browser...")
  57         (add-submenu
  58          '("Tools") ediff-misc-menu "OO-Browser...")
  59         (add-menu-button
  60          '("Tools")
  61          ["-------" nil nil] "OO-Browser...")
  62         )))
  63
  64
  65 ;; explicit string-match is needed: ediff-xemacs-p is not defined at build time
  66 (cond ((string-match "XEmacs" emacs-version)
  67        (defvar ediff-menu
  68          '("Compare"
  69            ["Two Files..."  ediff-files t]
  70            ["Two Buffers..." ediff-buffers t]
  71            ["Three Files..."  ediff-files3 t]
  72            ["Three Buffers..." ediff-buffers3 t]
  73            "---"
  74            ["Two Directories..." ediff-directories t]
  75            ["Three Directories..." ediff-directories3 t]
  76            "---"
  77            ["File with Revision..."  ediff-revision t]
  78            ["Directory Revisions..."  ediff-directory-revisions t]
  79            "---"
  80            ["Windows Word-by-word..." ediff-windows-wordwise t]
  81            ["Windows Line-by-line..." ediff-windows-linewise t]
  82            "---"
  83            ["Regions Word-by-word..." ediff-regions-wordwise t]
  84            ["Regions Line-by-line..." ediff-regions-linewise t]
  85            ))
  86        (defvar ediff-merge-menu
  87          '("Merge"
  88            ["Files..."  ediff-merge-files t]
  89            ["Files with Ancestor..." ediff-merge-files-with-ancestor t]
  90            ["Buffers..."  ediff-merge-buffers t]
  91            ["Buffers with Ancestor..."
  92             ediff-merge-buffers-with-ancestor t]
  93            "---"
  94            ["Directories..."  ediff-merge-directories t]
  95            ["Directories with Ancestor..."
  96             ediff-merge-directories-with-ancestor t]
  97            "---"
  98            ["Revisions..."  ediff-merge-revisions t]
  99            ["Revisions with Ancestor..."
 100             ediff-merge-revisions-with-ancestor t]
 101            ["Directory Revisions..." ediff-merge-directory-revisions t]
 102            ["Directory Revisions with Ancestor..."
 103             ediff-merge-directory-revisions-with-ancestor t]
 104            ))
 105        (defvar epatch-menu
 106          '("Apply Patch"
 107            ["To a file..."  ediff-patch-file t]
 108            ["To a buffer..." ediff-patch-buffer t]
 109            ))
 110        (defvar ediff-misc-menu
 111          '("Ediff Miscellanea"
 112            ["Ediff Manual..." ediff-documentation t]
 113            ["List Ediff Sessions..." ediff-show-registry t]
 114            ["Use separate frame for Ediff control buffer..."
 115             ediff-toggle-multiframe
 116             :style toggle
 117             :selected (if (and (featurep 'ediff-util)
 118                                (boundp 'ediff-window-setup-function))
 119                           (eq ediff-window-setup-function
 120                               'ediff-setup-windows-multiframe))]
 121            ["Use a toolbar with Ediff control buffer"
 122             ediff-toggle-use-toolbar
 123             :style toggle
 124             :selected (if (featurep 'ediff-tbar)
 125                           (ediff-use-toolbar-p))]
 126            ))
 127
 128        ;; put these menus before Object-Oriented-Browser in Tools menu
 129 ;;       (add-hook 'before-init-hook 'ediff-xemacs-init-menus)
 130 ;;       (if (not purify-flag)
 131 ;;         (ediff-xemacs-init-menus))
 132 ;;       )
 133        (ediff-xemacs-init-menus))
 134
 135       ;; Emacs--only if menu-bar is loaded
 136       ((featurep 'menu-bar)
 137        ;; initialize menu bar keymaps
 138        (defvar menu-bar-ediff-misc-menu
 139          (make-sparse-keymap "Ediff Miscellanea"))
 140        (fset 'menu-bar-ediff-misc-menu
 141              (symbol-value 'menu-bar-ediff-misc-menu))
 142        (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch"))
 143        (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
 144        (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge"))
 145        (fset 'menu-bar-ediff-merge-menu
 146              (symbol-value 'menu-bar-ediff-merge-menu))
 147        (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
 148        (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
 149
 150        ;; define ediff-menu
 151        (define-key menu-bar-ediff-menu [window]
 152          '("This Window and Next Window" . compare-windows))
 153        (define-key menu-bar-ediff-menu [ediff-windows-linewise]
 154          '("Windows Line-by-line..." . ediff-windows-linewise))
 155        (define-key menu-bar-ediff-menu [ediff-windows-wordwise]
 156          '("Windows Word-by-word..." . ediff-windows-wordwise))
 157        (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
 158        (define-key menu-bar-ediff-menu [ediff-regions-linewise]
 159          '("Regions Line-by-line..." . ediff-regions-linewise))
 160        (define-key menu-bar-ediff-menu [ediff-regions-wordwise]
 161          '("Regions Word-by-word..." . ediff-regions-wordwise))
 162        (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
 163        (define-key menu-bar-ediff-menu [ediff-dir-revision]
 164          '("Directory Revisions..." . ediff-directory-revisions))
 165        (define-key menu-bar-ediff-menu [ediff-revision]
 166          '("File with Revision..." . ediff-revision))
 167        (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
 168        (define-key menu-bar-ediff-menu [ediff-directories3]
 169          '("Three Directories..." . ediff-directories3))
 170        (define-key menu-bar-ediff-menu [ediff-directories]
 171          '("Two Directories..." . ediff-directories))
 172        (define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
 173        (define-key menu-bar-ediff-menu [ediff-buffers3]
 174          '("Three Buffers..." . ediff-buffers3))
 175        (define-key menu-bar-ediff-menu [ediff-files3]
 176          '("Three Files..." . ediff-files3))
 177        (define-key menu-bar-ediff-menu [ediff-buffers]
 178          '("Two Buffers..." . ediff-buffers))
 179        (define-key menu-bar-ediff-menu [ediff-files]
 180          '("Two Files..." . ediff-files))
 181
 182        ;; define merge menu
 183        (define-key
 184          menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
 185          '("Directory Revisions with Ancestor..."
 186            . ediff-merge-directory-revisions-with-ancestor))
 187        (define-key
 188          menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
 189          '("Directory Revisions..." . ediff-merge-directory-revisions))
 190        (define-key
 191          menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
 192          '("Revisions with Ancestor..."
 193            . ediff-merge-revisions-with-ancestor))
 194        (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
 195          '("Revisions..." . ediff-merge-revisions))
 196        (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
 197        (define-key
 198          menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]
 199          '("Directories with Ancestor..."
 200            . ediff-merge-directories-with-ancestor))
 201        (define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
 202          '("Directories..." . ediff-merge-directories))
 203        (define-key
 204          menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
 205        (define-key
 206          menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
 207          '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor))
 208        (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
 209          '("Buffers..." . ediff-merge-buffers))
 210        (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
 211          '("Files with Ancestor..." . ediff-merge-files-with-ancestor))
 212        (define-key menu-bar-ediff-merge-menu [ediff-merge-files]
 213          '("Files..." . ediff-merge-files))
 214
 215        ;; define epatch menu
 216        (define-key menu-bar-epatch-menu [ediff-patch-buffer]
 217          '("To a Buffer..." . ediff-patch-buffer))
 218        (define-key menu-bar-epatch-menu [ediff-patch-file]
 219          '("To a File..." . ediff-patch-file))
 220
 221        ;; define ediff miscellanea
 222        (define-key menu-bar-ediff-misc-menu [emultiframe]
 223          '("Toggle use of separate control buffer frame..."
 224            . ediff-toggle-multiframe))
 225        (define-key menu-bar-ediff-misc-menu [eregistry]
 226          '("List Ediff Sessions..." . ediff-show-registry))
 227        (define-key menu-bar-ediff-misc-menu [ediff-doc]
 228          '("Ediff Manual..." . ediff-documentation))
 229        )
 230
 231       ) ; cond
 232
 233 ;; arrange for autoloads
 234 (if purify-flag
 235     () ; if dumping, autoloads are set up in loaddefs.el
 236   ;; if the user decides to load this file, set up autoloads
 237   ;; compare files and buffers
 238   (autoload 'ediff "ediff" "Compare two files" t)
 239   (autoload 'ediff-files "ediff" "Compare two files" t)
 240   (autoload 'ediff-buffers "ediff" "Compare two bufers" t)
 241   (autoload 'ebuffers "ediff" "Compare two bufers" t)
 242   (autoload 'ediff3  "ediff"  "Compare three files" t)
 243   (autoload 'ediff-files3 "ediff" "Compare three files" t)
 244   (autoload 'ediff-buffers3 "ediff" "Compare three bufers" t)
 245   (autoload 'ebuffers3 "ediff" "Compare three bufers" t)
 246
 247   (autoload 'erevision "ediff" "Compare versions of a file" t)
 248   (autoload 'ediff-revision "ediff" "Compare versions of a file" t)
 249
 250   ;; compare regions and windows
 251   (autoload 'ediff-windows-wordwise
 252     "ediff" "Compare two windows word-by-word." t)
 253   (autoload 'ediff-regions-wordwise
 254     "ediff" "Compare two regions word-by-word." t)
 255   (autoload 'ediff-windows-linewise
 256     "ediff" "Compare two windows line-by-line." t)
 257   (autoload 'ediff-regions-linewise
 258     "ediff" "Compare two regions line-by-line." t)
 259
 260   ;; patch
 261   (autoload 'ediff-patch-file "ediff" "Patch a file." t)
 262   (autoload 'epatch "ediff" "Patch a file." t)
 263   (autoload 'ediff-patch-buffer "ediff" "Patch a buffer.")
 264   (autoload 'epatch-buffer "ediff" "Patch a buffer." t)
 265
 266   ;; merge
 267   (autoload 'ediff-merge "ediff" "Merge two files." t)
 268   (autoload 'ediff-merge-files "ediff" "Merge two files." t)
 269   (autoload 'ediff-merge-files-with-ancestor
 270     "ediff" "Merge two files using a third file as an ancestor." t)
 271   (autoload 'ediff-merge-buffers "ediff" "Merge two buffers." t)
 272   (autoload 'ediff-merge-buffers-with-ancestor
 273     "ediff" "Merge two buffers using a third buffer as an ancestor." t)
 274
 275   (autoload 'ediff-merge-revisions "ediff" "Merge two versions of a file." t)
 276   (autoload 'ediff-merge-revisions-with-ancestor
 277     "ediff" "Merge two versions of a file." t)
 278
 279   ;; compare directories
 280   (autoload 'edirs "ediff" "Compare files in two directories." t)
 281   (autoload 'ediff-directories "ediff" "Compare files in two directories." t)
 282   (autoload 'edirs3 "ediff" "Compare files in three directories." t)
 283   (autoload
 284     'ediff-directories3 "ediff" "Compare files in three directories." t)
 285
 286   (autoload 'edir-revisions
 287     "ediff" "Compare two versions of a file." t)
 288   (autoload 'ediff-directory-revisions
 289     "ediff" "Compare two versions of a file." t)
 290
 291   ;; merge directories
 292   (autoload 'edirs-merge "ediff" "Merge files in two directories." t)
 293   (autoload 'ediff-merge-directories
 294     "ediff" "Merge files in two directories." t)
 295   (autoload 'edirs-merge-with-ancestor
 296     "ediff"
 297     "Merge files in two directories using files in a third dir as ancestors."
 298     t)
 299   (autoload 'ediff-merge-directories-with-ancestor
 300     "ediff"
 301     "Merge files in two directories using files in a third dir as ancestors."
 302     t)
 303
 304   (autoload 'edir-merge-revisions
 305     "ediff" "Merge versions of files in a directory." t)
 306   (autoload 'ediff-merge-directory-revisions
 307     "ediff" "Merge versions of files in a directory." t)
 308   (autoload 'ediff-merge-directory-revisions-with-ancestor
 309     "ediff"
 310     "Merge versions of files in a directory using other versions as ancestors."
 311     t)
 312   (autoload 'edir-merge-revisions-with-ancestor
 313     "ediff"
 314     "Merge versions of files in a directory using other versions as ancestors."
 315     t)
 316
 317   ;; misc
 318   (autoload 'ediff-show-registry
 319     "ediff-mult"
 320     "Display the registry of active Ediff sessions."
 321     t)
 322   (autoload 'eregistry
 323     "ediff-mult"
 324     "Display the registry of active Ediff sessions."
 325     t)
 326   (autoload 'ediff-documentation
 327     "ediff"
 328     "Display Ediff's manual."
 329     t)
 330   (autoload 'ediff-version
 331     "ediff"
 332     "Show Ediff's version and last modification date."
 333     t)
 334   (autoload 'ediff-toggle-multiframe
 335     "ediff-util"
 336     "Toggle the use of separate frame for Ediff control buffer."
 337     t)
 338   (autoload 'ediff-toggle-use-toolbar
 339     "ediff-util"
 340     "Toggle the use of Ediff toolbar."
 341     t)
 342
 343   ) ; if purify-flag
 344
 345
 346 (provide 'ediff-hook)
 347
 348
 349 ;;; ediff-hook.el ends here