;ELC ;;; compiled by kwzh@nutrimat.gnu.ai.mit.edu on Wed Jul 17 15:42:13 1996 ;;; from file /gd/gnu/emacs/19.0/lisp/ediff-hook.el ;;; emacs version 19.31.94.1. ;;; bytecomp version FSF 2.10 ;;; optimization is on. ;;; this file uses opcodes which do not exist in Emacs 18. (if (and (boundp 'emacs-version) (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 "À B Bà BÀ‡" [ediff-menu current-load-list ediff-merge-menu epatch-menu] 2) (defalias 'ediff-xemacs-init-menus #[nil "ÀÁ!…ÂÃ\fÅ#ˆÂÆÅ#ˆÂÈ Å#ˆÊËÌÅ#‡" [featurep menubar add-submenu ("Tools") ediff-menu "OO-Browser..." ("Tools") ediff-merge-menu ("Tools") epatch-menu add-menu-button ("Tools") ["-------" nil nil]] 4]) (byte-code "ÀÁ\n\"ƒCÃÄ!„ÅÄBÃÇ!„ÈÇBÃÉ!„-Ê ÉBËÌÍ\"ˆ„õÍ ˆ‚õÏĞ!ƒõÃÑ!„TÒÓ!ÑBщJMˆÃÔ!„jÒÕ!ÔBÔ‰JMˆÃÖ!„€Ò×!ÖBÖ‰JMˆØÙÚ#ˆØÛÜ#ˆØİŞ#ˆØßà#ˆØáâ#ˆØãä#ˆØåæ#ˆØçè#ˆØéê#ˆØëì#ˆØíî#ˆØïğ#ˆØñò#ˆØóô#ˆØõö#ˆØ÷ø#ˆØùú#ˆØûü#ˆØış#ˆØÿ@#ˆØAB#ˆØCD#ˆØEF#ˆØGH#ˆØIJ#ˆØKL#ˆØMN#ˆØOP#ˆØQR#ˆØST#ˆØUV#ˆØWX#ˆØYZ#ˆØ[\\#ˆØ]^#ˆØ_`#ˆØab#ˆØcd#ˆØef#ˆØgh#ˆ„°ijklm$ˆinklm$ˆiokpm$ˆiqkpm$ˆirksm$ˆitksm$ˆiukvm$ˆiwkvm$ˆixkym$ˆizk{m$ˆi|k}m$ˆi~km$ˆi€km$ˆi‚kƒm$ˆi„kƒm$ˆi…k†#ˆi‡k†m$ˆiˆk‰m$ˆiŠk‰m$ˆi‹kŒm$ˆikm$ˆikm$ˆi‘k’m$ˆi“k’m$ˆi”k•m$ˆi–k•m$ˆi—k˜m$ˆi™k˜m$ˆišk›m$ˆiœk›m$ˆikm$ˆiŸkm$ˆi k¡m$ˆi¢k¡m$ˆi£k¤m$ˆi¥k¤m$ˆi¦k§m$ˆi¨k§m$ˆi©ª«m$ˆi¬k­m$ˆi®k¯m$ˆ°±!‡" [string-match "XEmacs" emacs-version boundp ediff-menu ("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] "---" ["List Ediff Sessions..." ediff-show-registry t] ["Ediff Manual..." ediff-documentation t]) current-load-list ediff-merge-menu ("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] "---" ["List Ediff Sessions..." ediff-show-registry t] ["Ediff Manual..." ediff-documentation t]) epatch-menu ("Apply Patch" ["To a file..." ediff-patch-file t] ["To a buffer..." ediff-patch-buffer t] "---" ["List Ediff Sessions..." ediff-show-registry t] ["Ediff Manual..." ediff-documentation t]) add-hook before-init-hook ediff-xemacs-init-menus purify-flag featurep menu-bar menu-bar-epatch-menu make-sparse-keymap "Apply Patch" menu-bar-ediff-merge-menu "Merge" menu-bar-ediff-menu "Compare" define-key [ediff-doc] ("Ediff Manual..." . ediff-documentation) [eregistry] ("List Ediff Sessions..." . ediff-show-registry) [separator-ediff-manual] ("--") [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-doc2] ("Ediff Manual..." . ediff-documentation) [eregistry2] ("List Ediff Sessions..." . ediff-show-registry) [separator-ediff-merge-manual] ("--") [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) [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-doc3] ("Ediff Manual..." . ediff-documentation) [eregistry3] ("List Ediff Sessions..." . ediff-show-registry) [separator-epatch] ("--") [ediff-patch-buffer] ("To a Buffer..." . ediff-patch-buffer) [ediff-patch-file] ("To a File..." . ediff-patch-file) 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 ediff-revision "Compare versions of a file" 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-meta" "Display the registry of active Ediff sessions." ediff-documentation "Display Ediff's manual." ediff-version "Show Ediff's version and last modification date." provide ediff-hook] 5)