;ELC ;;; Compiled by rms@psilocin.gnu.org on Mon May 4 23:30:51 1998 ;;; from file /gd/gnu/emacs/lisp/ediff-hook.el ;;; in Emacs version 20.2.92.10 ;;; with bytecomp version 2.41 ;;; with all optimizations. ;;; This file uses opcodes which do not exist in Emacs 18. (if (and (boundp 'emacs-version) (< (aref emacs-version (1- (length emacs-version))) ?A) (or (and (boundp 'epoch::version) epoch::version) (string-lessp emacs-version "19.29"))) (error "`ediff-hook.el' was compiled for Emacs 19.29 or later")) (byte-code "\301B\302B\303B\304B\305B\301\207" [current-load-list ediff-menu ediff-merge-menu epatch-menu ediff-misc-menu ediff-window-setup-function] 2) (defalias 'ediff-xemacs-init-menus #[nil "\304\305!\205#\306\307\310#\210\306\311 \310#\210\306\312\n\310#\210\306\313 \310#\210\314\315\316\310#\207" [ediff-menu ediff-merge-menu epatch-menu ediff-misc-menu featurep menubar add-submenu ("Tools") "OO-Browser..." ("Tools") ("Tools") ("Tools") add-menu-button ("Tools") ["-------" nil nil]] 4]) (byte-code "\306\307\"\203=\310\301!\204\311\301\nB\310\303!\204\312\303\nB\310\304!\204'\313\304\nB\310\305!\2043\314\305\nB\315 \210\202\275\316\317!\203\275\310\320!\204N\321\322!\320\nB\320\211JM\210\310\323!\204b\321\324!\323\nB\323\211JM\210\310\325!\204v\321\326!\325\nB\325\211JM\210\310\327!\204\212\321\330!\327\nB\327\211JM\210\331\332\333#\210\331\334\335#\210\331\336\337#\210\331\340\341#\210\331\342\343#\210\331\344\345#\210\331\346\347#\210\331\350\351#\210\331\352\353#\210\331\354\355#\210\331\356\357#\210\331\360\361#\210\331\362\363#\210\331\364\365#\210\331\366\367#\210\331\370\371#\210\331\372\373#\210\331\374\375#\210\331\376\377#\210\331\201A\201B#\210\331\201C\201D#\210\331\201E\201F#\210\331\201G\201H#\210\331\201I\201J#\210\331\201K\201L#\210\331\201M\201N#\210\331\201O\201P#\210\331\201Q\201R#\210\331\201S\201T#\210\331\201U\201V#\210\331\201W\201X#\210\331\201Y\201Z#\210\331\201[\201\\#\210\331\201]\201^#\210@\204\274\201_\201`\201a\201b\201c$\210\201_\201d\201a\201b\201c$\210\201_\201e\201a\201f\201c$\210\201_\201g\201a\201f\201c$\210\201_\201h\201a\201i\201c$\210\201_\201j\201a\201i\201c$\210\201_\201k\201a\201l\201c$\210\201_\201m\201a\201l\201c$\210\201_\201n\201a\201o\201c$\210\201_\201p\201a\201o\201c$\210\201_\201q\201a\201r\201c$\210\201_\201s\201a\201t\201c$\210\201_\201u\201a\201v\201c$\210\201_\201w\201a\201x\201c$\210\201_\201y\201a\201z\201c$\210\201_\201{\201a\201z\201c$\210\201_\201|\201a\201}#\210\201_\201~\201a\201}\201c$\210\201_\201\201a\201\200\201c$\210\201_\201\201\201a\201\200\201c$\210\201_\201\202\201a\201\203\201c$\210\201_\201\204\201a\201\205\201c$\210\201_\201\206\201a\201\207\201c$\210\201_\201\210\201a\201\211\201c$\210\201_\201\212\201a\201\211\201c$\210\201_\201\213\201a\201\214\201c$\210\201_\201\215\201a\201\214\201c$\210\201_\201\216\201a\201\217\201c$\210\201_\201\220\201a\201\217\201c$\210\201_\201\221\201a\201\222\201c$\210\201_\201\223\201a\201\222\201c$\210\201_\201\224\201a\201\225\201c$\210\201_\201\226\201a\201\225\201c$\210\201_\201\227\201a\201\230\201c$\210\201_\201\231\201a\201\230\201c$\210\201_\201\232\201a\201\233\201c$\210\201_\201\234\201a\201\233\201c$\210\201_\201\235\201a\201\236\201c$\210\201_\201\237\201a\201\236\201c$\210\201_\201\240\201\241\201\242\201c$\210\201_\201\243\201\241\201\242\201c$\210\201_\201\244\201a\201\245\201c$\210\201_\201\246\201a\201\247\201c$\210\201_\201\250\201\251\201\252\201c$\210\201_\201\253\201\251\201\254\201c$\210\201\255\201\256!\207" [emacs-version ediff-menu current-load-list ediff-merge-menu epatch-menu ediff-misc-menu string-match "XEmacs" boundp ("Compare" ["Two Files..." ediff-files t] ["Two Buffers..." ediff-buffers t] ["Three Files..." ediff-files3 t] ["Three Buffers..." ediff-buffers3 t] "---" ["Two Directories..." ediff-directories t] ["Three Directories..." ediff-directories3 t] "---" ["File with Revision..." ediff-revision t] ["Directory Revisions..." ediff-directory-revisions t] "---" ["Windows Word-by-word..." ediff-windows-wordwise t] ["Windows Line-by-line..." ediff-windows-linewise t] "---" ["Regions Word-by-word..." ediff-regions-wordwise t] ["Regions Line-by-line..." ediff-regions-linewise t]) ("Merge" ["Files..." ediff-merge-files t] ["Files with Ancestor..." ediff-merge-files-with-ancestor t] ["Buffers..." ediff-merge-buffers t] ["Buffers with Ancestor..." ediff-merge-buffers-with-ancestor t] "---" ["Directories..." ediff-merge-directories t] ["Directories with Ancestor..." ediff-merge-directories-with-ancestor t] "---" ["Revisions..." ediff-merge-revisions t] ["Revisions with Ancestor..." ediff-merge-revisions-with-ancestor t] ["Directory Revisions..." ediff-merge-directory-revisions t] ["Directory Revisions with Ancestor..." ediff-merge-directory-revisions-with-ancestor t]) ("Apply Patch" ["To a file..." ediff-patch-file t] ["To a buffer..." ediff-patch-buffer t]) ("Ediff Miscellanea" ["Ediff Manual..." ediff-documentation t] ["List Ediff Sessions..." ediff-show-registry t] ["Use separate frame for Ediff control buffer..." ediff-toggle-multiframe :style toggle :selected (if (and (featurep 'ediff-util) (boundp 'ediff-window-setup-function)) (eq ediff-window-setup-function 'ediff-setup-windows-multiframe))] ["Use a toolbar with Ediff control buffer" ediff-toggle-use-toolbar :style toggle :selected (if (featurep 'ediff-tbar) (ediff-use-toolbar-p))]) ediff-xemacs-init-menus featurep menu-bar menu-bar-ediff-misc-menu make-sparse-keymap "Ediff Miscellanea" menu-bar-epatch-menu "Apply Patch" menu-bar-ediff-merge-menu "Merge" menu-bar-ediff-menu "Compare" define-key [window] ("This Window and Next Window" . compare-windows) [ediff-windows-linewise] ("Windows Line-by-line..." . ediff-windows-linewise) [ediff-windows-wordwise] ("Windows Word-by-word..." . ediff-windows-wordwise) [separator-ediff-windows] ("--") [ediff-regions-linewise] ("Regions Line-by-line..." . ediff-regions-linewise) [ediff-regions-wordwise] ("Regions Word-by-word..." . ediff-regions-wordwise) [separator-ediff-regions] ("--") [ediff-dir-revision] ("Directory Revisions..." . ediff-directory-revisions) [ediff-revision] ("File with Revision..." . ediff-revision) [separator-ediff-directories] ("--") [ediff-directories3] ("Three Directories..." . ediff-directories3) [ediff-directories] ("Two Directories..." . ediff-directories) [separator-ediff-files] ("--") [ediff-buffers3] ("Three Buffers..." . ediff-buffers3) [ediff-files3] ("Three Files..." . ediff-files3) [ediff-buffers] ("Two Buffers..." . ediff-buffers) [ediff-files] ("Two Files..." . ediff-files) [ediff-merge-dir-revisions-with-ancestor] ("Directory Revisions with Ancestor..." . ediff-merge-directory-revisions-with-ancestor) [ediff-merge-dir-revisions] ("Directory Revisions..." . ediff-merge-directory-revisions) purify-flag [ediff-merge-revisions-with-ancestor] ("Revisions with Ancestor..." . ediff-merge-revisions-with-ancestor) [ediff-merge-revisions] ("Revisions..." . ediff-merge-revisions) [separator-ediff-merge] ("--") [ediff-merge-directories-with-ancestor] ("Directories with Ancestor..." . ediff-merge-directories-with-ancestor) [ediff-merge-directories] ("Directories..." . ediff-merge-directories) [separator-ediff-merge-dirs] ("--") [ediff-merge-buffers-with-ancestor] ("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor) [ediff-merge-buffers] ("Buffers..." . ediff-merge-buffers) [ediff-merge-files-with-ancestor] ("Files with Ancestor..." . ediff-merge-files-with-ancestor) [ediff-merge-files] ("Files..." . ediff-merge-files) [ediff-patch-buffer] ("To a Buffer..." . ediff-patch-buffer) [ediff-patch-file] ("To a File..." . ediff-patch-file) [emultiframe] ("Toggle use of separate control buffer frame..." . ediff-toggle-multiframe) [eregistry] ("List Ediff Sessions..." . ediff-show-registry) [ediff-doc] ("Ediff Manual..." . ediff-documentation) autoload ediff "ediff" "Compare two files" t ediff-files ediff-buffers "Compare two bufers" ebuffers ediff3 "Compare three files" ediff-files3 ediff-buffers3 "Compare three bufers" ebuffers3 erevision "Compare versions of a file" ediff-revision ediff-windows-wordwise "Compare two windows word-by-word." ediff-regions-wordwise "Compare two regions word-by-word." ediff-windows-linewise "Compare two windows line-by-line." ediff-regions-linewise "Compare two regions line-by-line." ediff-patch-file "Patch a file." epatch ediff-patch-buffer "Patch a buffer." epatch-buffer ediff-merge "Merge two files." ediff-merge-files ediff-merge-files-with-ancestor "Merge two files using a third file as an ancestor." ediff-merge-buffers "Merge two buffers." ediff-merge-buffers-with-ancestor "Merge two buffers using a third buffer as an ancestor." ediff-merge-revisions "Merge two versions of a file." ediff-merge-revisions-with-ancestor edirs "Compare files in two directories." ediff-directories edirs3 "Compare files in three directories." ediff-directories3 edir-revisions "Compare two versions of a file." ediff-directory-revisions edirs-merge "Merge files in two directories." ediff-merge-directories edirs-merge-with-ancestor "Merge files in two directories using files in a third dir as ancestors." ediff-merge-directories-with-ancestor edir-merge-revisions "Merge versions of files in a directory." ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor "Merge versions of files in a directory using other versions as ancestors." edir-merge-revisions-with-ancestor ediff-show-registry "ediff-mult" "Display the registry of active Ediff sessions." eregistry ediff-documentation "Display Ediff's manual." ediff-version "Show Ediff's version and last modification date." ediff-toggle-multiframe "ediff-util" "Toggle the use of separate frame for Ediff control buffer." ediff-toggle-use-toolbar "Toggle the use of Ediff toolbar." provide ediff-hook] 5)