lisp/ediff-hook.el

   1 ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
   2
   3 ;; Copyright (C) 1995, 1996 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 [epatch]
  29 ;;      '("Apply Patch" . menu-bar-epatch-menu))
  30 ;;      (define-key menu-bar-tools-menu [ediff-merge]
  31 ;;      '("Merge" . menu-bar-ediff-merge-menu))
  32 ;;      (define-key menu-bar-tools-menu [ediff]
  33 ;;      '("Compare" . menu-bar-ediff-menu))
  34
  35 ;; Compiler pacifier
  36 (defvar ediff-menu)
  37 (defvar ediff-merge-menu)
  38 (defvar epatch-menu)
  39 ;; end pacifier
  40
  41
  42 (defun ediff-xemacs-init-menus ()
  43   (if (featurep 'menubar)
  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...")
  59         (add-submenu
  60          '("Tools") ediff-menu "OO-Browser...")
  61         (add-submenu
  62          '("Tools") ediff-merge-menu "OO-Browser...")
  63         (add-submenu
  64          '("Tools") epatch-menu "OO-Browser...")
  65         (add-menu-button
  66          '("Tools")
  67          ["-------" nil nil] "OO-Browser...")
  68         )))
  69
  70
  71 ;; explicit string-match is needed: ediff-xemacs-p is not defined at build time
  72 (cond ((string-match "XEmacs" emacs-version)
  73        (defvar ediff-menu
  74          '("Compare"
  75            ["Two Files..."  ediff-files t]
  76            ["Two Buffers..." ediff-buffers t]
  77            ["Three Files..."  ediff-files3 t]
  78            ["Three Buffers..." ediff-buffers3 t]
  79            "---"
  80            ["Two Directories..." ediff-directories t]
  81            ["Three Directories..." ediff-directories3 t]
  82            "---"
  83            ["File with Revision..."  ediff-revision t]
  84            ["Directory Revisions..."  ediff-directory-revisions t]
  85            "---"
  86            ["Windows Word-by-word..." ediff-windows-wordwise t]
  87            ["Windows Line-by-line..." ediff-windows-linewise t]
  88            "---"
  89            ["Regions Word-by-word..." ediff-regions-wordwise t]
  90            ["Regions Line-by-line..." ediff-regions-linewise t]
  91            "---"
  92            ["List Ediff Sessions..." ediff-show-registry t]
  93            ["Ediff Manual..." ediff-documentation t]
  94            ))
  95        (defvar ediff-merge-menu
  96          '("Merge"
  97            ["Files..."  ediff-merge-files t]
  98            ["Files with Ancestor..." ediff-merge-files-with-ancestor t]
  99            ["Buffers..."  ediff-merge-buffers t]
 100            ["Buffers with Ancestor..."
 101             ediff-merge-buffers-with-ancestor t]
 102            "---"
 103            ["Directories..."  ediff-merge-directories t]
 104            ["Directories with Ancestor..."
 105             ediff-merge-directories-with-ancestor t]
 106            "---"
 107            ["Revisions..."  ediff-merge-revisions t]
 108            ["Revisions with Ancestor..."
 109             ediff-merge-revisions-with-ancestor t]
 110            ["Directory Revisions..." ediff-merge-directory-revisions t]
 111            ["Directory Revisions with Ancestor..."
 112             ediff-merge-directory-revisions-with-ancestor t]
 113            "---"
 114            ["List Ediff Sessions..." ediff-show-registry t]
 115            ["Ediff Manual..." ediff-documentation t]
 116            ))
 117        (defvar epatch-menu
 118          '("Apply Patch"
 119            ["To a file..."  ediff-patch-file t]
 120            ["To a buffer..." ediff-patch-buffer t]
 121            "---"
 122            ["List Ediff Sessions..." ediff-show-registry t]
 123            ["Ediff Manual..." ediff-documentation t]
 124            ))
 125
 126        ;; put these menus before Object-Oriented-Browser in Tools menu
 127        (add-hook 'before-init-hook 'ediff-xemacs-init-menus)
 128        (if (not purify-flag)
 129            (ediff-xemacs-init-menus))
 130        )
 131
 132       ;; Emacs--only if menu-bar is loaded
 133       ((featurep 'menu-bar)
 134        ;; initialize menu bar keymaps
 135        (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch"))
 136        (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
 137        (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge"))
 138        (fset 'menu-bar-ediff-merge-menu
 139              (symbol-value 'menu-bar-ediff-merge-menu))
 140        (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
 141        (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
 142
 143        ;; define ediff-menu
 144        (define-key menu-bar-ediff-menu [ediff-doc]
 145          '("Ediff Manual..." . ediff-documentation))
 146        (define-key menu-bar-ediff-menu [emultiframe]
 147         '("Toggle separate control buffer frame..."
 148           . ediff-toggle-multiframe))
 149        (define-key menu-bar-ediff-menu [eregistry]
 150         '("List Ediff Sessions..." . ediff-show-registry))
 151        (define-key menu-bar-ediff-menu [separator-ediff-manual] '("--"))
 152        (define-key menu-bar-ediff-menu [window]
 153          '("This Window and Next Window" . compare-windows))
 154        (define-key menu-bar-ediff-menu [ediff-windows-linewise]
 155          '("Windows Line-by-line..." . ediff-windows-linewise))
 156        (define-key menu-bar-ediff-menu [ediff-windows-wordwise]
 157          '("Windows Word-by-word..." . ediff-windows-wordwise))
 158        (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
 159        (define-key menu-bar-ediff-menu [ediff-regions-linewise]
 160          '("Regions Line-by-line..." . ediff-regions-linewise))
 161        (define-key menu-bar-ediff-menu [ediff-regions-wordwise]
 162          '("Regions Word-by-word..." . ediff-regions-wordwise))
 163        (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
 164        (define-key menu-bar-ediff-menu [ediff-dir-revision]
 165          '("Directory Revisions..." . ediff-directory-revisions))
 166        (define-key menu-bar-ediff-menu [ediff-revision]
 167          '("File with Revision..." . ediff-revision))
 168        (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
 169        (define-key menu-bar-ediff-menu [ediff-directories3]
 170          '("Three Directories..." . ediff-directories3))
 171        (define-key menu-bar-ediff-menu [ediff-directories]
 172          '("Two Directories..." . ediff-directories))
 173        (define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
 174        (define-key menu-bar-ediff-menu [ediff-buffers3]
 175          '("Three Buffers..." . ediff-buffers3))
 176        (define-key menu-bar-ediff-menu [ediff-files3]
 177          '("Three Files..." . ediff-files3))
 178        (define-key menu-bar-ediff-menu [ediff-buffers]
 179          '("Two Buffers..." . ediff-buffers))
 180        (define-key menu-bar-ediff-menu [ediff-files]
 181          '("Two Files..." . ediff-files))
 182
 183        ;; define merge menu
 184        (define-key menu-bar-ediff-merge-menu [ediff-doc2]
 185          '("Ediff Manual..." . ediff-documentation))
 186        (define-key menu-bar-ediff-merge-menu [emultiframe2]
 187         '("Toggle separate control buffer frame..."
 188           . ediff-toggle-multiframe))
 189        (define-key menu-bar-ediff-merge-menu [eregistry2]
 190         '("List Ediff Sessions..." . ediff-show-registry))
 191        (define-key
 192          menu-bar-ediff-merge-menu [separator-ediff-merge-manual] '("--"))
 193        (define-key
 194          menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
 195          '("Directory Revisions with Ancestor..."
 196            . ediff-merge-directory-revisions-with-ancestor))
 197        (define-key
 198          menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
 199          '("Directory Revisions..." . ediff-merge-directory-revisions))
 200        (define-key
 201          menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
 202          '("Revisions with Ancestor..."
 203            . ediff-merge-revisions-with-ancestor))
 204        (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
 205          '("Revisions..." . ediff-merge-revisions))
 206        (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
 207        (define-key
 208          menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]
 209          '("Directories with Ancestor..."
 210            . ediff-merge-directories-with-ancestor))
 211        (define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
 212          '("Directories..." . ediff-merge-directories))
 213        (define-key
 214          menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
 215        (define-key
 216          menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
 217          '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor))
 218        (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
 219          '("Buffers..." . ediff-merge-buffers))
 220        (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
 221          '("Files with Ancestor..." . ediff-merge-files-with-ancestor))
 222        (define-key menu-bar-ediff-merge-menu [ediff-merge-files]
 223          '("Files..." . ediff-merge-files))
 224
 225        ;; define epatch menu
 226        (define-key menu-bar-epatch-menu [ediff-doc3]
 227          '("Ediff Manual..." . ediff-documentation))
 228        (define-key menu-bar-epatch-menu [emultiframe3]
 229         '("Toggle separate control buffer frame..."
 230           . ediff-toggle-multiframe))
 231        (define-key menu-bar-epatch-menu [eregistry3]
 232         '("List Ediff Sessions..." . ediff-show-registry))
 233        (define-key menu-bar-epatch-menu [separator-epatch] '("--"))
 234        (define-key menu-bar-epatch-menu [ediff-patch-buffer]
 235          '("To a Buffer..." . ediff-patch-buffer))
 236        (define-key menu-bar-epatch-menu [ediff-patch-file]
 237          '("To a File..." . ediff-patch-file)))
 238
 239       ) ; cond
 240
 241 ;; arrange for autoloads
 242 (if purify-flag
 243     () ; if dumping, autoloads are set up in loaddefs.el
 244   ;; if the user decides to load this file, set up autoloads
 245   ;; compare files and buffers
 246   (autoload 'ediff "ediff" "Compare two files" t)
 247   (autoload 'ediff-files "ediff" "Compare two files" t)
 248   (autoload 'ediff-buffers "ediff" "Compare two bufers" t)
 249   (autoload 'ebuffers "ediff" "Compare two bufers" t)
 250   (autoload 'ediff3  "ediff"  "Compare three files" t)
 251   (autoload 'ediff-files3 "ediff" "Compare three files" t)
 252   (autoload 'ediff-buffers3 "ediff" "Compare three bufers" t)
 253   (autoload 'ebuffers3 "ediff" "Compare three bufers" t)
 254
 255   (autoload 'ediff-revision "ediff" "Compare versions of a file" t)
 256
 257   ;; compare regions and windows
 258   (autoload 'ediff-windows-wordwise
 259     "ediff" "Compare two windows word-by-word." t)
 260   (autoload 'ediff-regions-wordwise
 261     "ediff" "Compare two regions word-by-word." t)
 262   (autoload 'ediff-windows-linewise
 263     "ediff" "Compare two windows line-by-line." t)
 264   (autoload 'ediff-regions-linewise
 265     "ediff" "Compare two regions line-by-line." t)
 266
 267   ;; patch
 268   (autoload 'ediff-patch-file "ediff" "Patch a file." t)
 269   (autoload 'epatch "ediff" "Patch a file." t)
 270   (autoload 'ediff-patch-buffer "ediff" "Patch a buffer.")
 271   (autoload 'epatch-buffer "ediff" "Patch a buffer." t)
 272
 273   ;; merge
 274   (autoload 'ediff-merge "ediff" "Merge two files." t)
 275   (autoload 'ediff-merge-files "ediff" "Merge two files." t)
 276   (autoload 'ediff-merge-files-with-ancestor
 277     "ediff" "Merge two files using a third file as an ancestor." t)
 278   (autoload 'ediff-merge-buffers "ediff" "Merge two buffers." t)
 279   (autoload 'ediff-merge-buffers-with-ancestor
 280     "ediff" "Merge two buffers using a third buffer as an ancestor." t)
 281
 282   (autoload 'ediff-merge-revisions "ediff" "Merge two versions of a file." t)
 283   (autoload 'ediff-merge-revisions-with-ancestor
 284     "ediff" "Merge two versions of a file." t)
 285
 286   ;; compare directories
 287   (autoload 'edirs "ediff" "Compare files in two directories." t)
 288   (autoload 'ediff-directories "ediff" "Compare files in two directories." t)
 289   (autoload 'edirs3 "ediff" "Compare files in three directories." t)
 290   (autoload
 291     'ediff-directories3 "ediff" "Compare files in three directories." t)
 292
 293   (autoload 'edir-revisions
 294     "ediff" "Compare two versions of a file." t)
 295   (autoload 'ediff-directory-revisions
 296     "ediff" "Compare two versions of a file." t)
 297
 298   ;; merge directories
 299   (autoload 'edirs-merge "ediff" "Merge files in two directories." t)
 300   (autoload 'ediff-merge-directories
 301     "ediff" "Merge files in two directories." t)
 302   (autoload 'edirs-merge-with-ancestor
 303     "ediff"
 304     "Merge files in two directories using files in a third dir as ancestors."
 305     t)
 306   (autoload 'ediff-merge-directories-with-ancestor
 307     "ediff"
 308     "Merge files in two directories using files in a third dir as ancestors."
 309     t)
 310
 311   (autoload 'edir-merge-revisions
 312     "ediff" "Merge versions of files in a directory." t)
 313   (autoload 'ediff-merge-directory-revisions
 314     "ediff" "Merge versions of files in a directory." t)
 315   (autoload 'ediff-merge-directory-revisions-with-ancestor
 316     "ediff"
 317     "Merge versions of files in a directory using other versions as ancestors."
 318     t)
 319   (autoload 'edir-merge-revisions-with-ancestor
 320     "ediff"
 321     "Merge versions of files in a directory using other versions as ancestors."
 322     t)
 323
 324   ;; misc
 325   (autoload 'ediff-show-registry
 326     "ediff-mult"
 327     "Display the registry of active Ediff sessions."
 328     t)
 329   (autoload 'ediff-documentation
 330     "ediff"
 331     "Display Ediff's manual."
 332     t)
 333   (autoload 'ediff-version
 334     "ediff"
 335     "Show Ediff's version and last modification date."
 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))
 346   ) ; if purify-flag
 347
 348
 349 (provide 'ediff-hook)
 350
 351
 352 ;;; ediff-hook.el ends here