;ELC ;;; Compiled by cyd@localhost on Mon Apr 23 22:20:40 2007 ;;; from file /home/cyd/emacs/lisp/ediff-hook.el ;;; in Emacs version 22.0.99 ;;; with all optimizations. ;;; This file uses dynamic docstrings, first added in Emacs 19.29. (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")) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defalias 'ediff-cond-compile-for-xemacs-or-emacs '(macro . #[(xemacs-form emacs-form) "\303\304\"\203 \207\n\207" [emacs-version xemacs-form emacs-form string-match "XEmacs"] 3])) (byte-code "\306\307!\203\\\304B\310\304!\204\311\304\312\313!\"\210\304\211JM\210\303B\310\303!\204-\311\303\312\314!\"\210\303\211JM\210\302B\310\302!\204C\311\302\312\315!\"\210\302\211JM\210\301B\310\301!\204Y\311\301\312\316!\"\210\301\211JM\210\317 \320\321#\210\317 \322\323#\210\317 \324\325#\210\317 \326\327#\210\317 \330\331#\210\317 \332\333#\210\317 \334\335#\210\317 \336\337#\210\317 \340\341#\210\317 \342\343#\210\317 \344\345#\210\317 \346\347#\210\317 \350\351#\210\317 \352\353#\210\317 \354\355#\210\317 \356\357#\210\317 \360\361#\210\317\n\362\363#\210\317\n\364\365#\210\317\n\366\367#\210\317\n\370\371#\210\317\n\372\373#\210\317\n\374\375#\210\317\n\376\377#\210\317\n\201@\201A#\210\317\n\201B\201C#\210\317\n\201D\201E#\210\317\n\201F\201G#\210\317\n\201H\201I#\210\317 \201J\201K#\210\317 \201L\201M#\210\317\f\201N\201O#\210\317\f\201P\201Q#\210\317\f\201R\201S#\210\317\f\201T\201U#\210 \204Z\201V\201W\201X\201Y\201Z$\210\201V\201[\201X\201Y\201Z$\210\201V\201\\\201X\201]\201Z$\210\201V\201^\201X\201]\201Z$\210\201V\201_\201X\201`\201Z$\210\201V\201a\201X\201`\201Z$\210\201V\201b\201X\201c\201Z$\210\201V\201d\201X\201c\201Z$\210\201V\201e\201X\201f\201Z$\210\201V\201g\201X\201f\201Z$\210\201V\201h\201X\201i\201Z$\210\201V\201j\201X\201k\201Z$\210\201V\201l\201X\201m\201Z$\210\201V\201n\201X\201o\201Z$\210\201V\201p\201X\201q\201Z$\210\201V\201r\201X\201q\201Z$\210\201V\201s\201X\201t#\210\201V\201u\201X\201t\201Z$\210\201V\201v\201X\201w\201Z$\210\201V\201x\201X\201w\201Z$\210\201V\201y\201X\201z\201Z$\210\201V\201{\201X\201|\201Z$\210\201V\201}\201X\201~\201Z$\210\201V\201\201X\201\200\201Z$\210\201V\201\201\201X\201\200\201Z$\210\201V\201\202\201X\201\203\201Z$\210\201V\201\204\201X\201\203\201Z$\210\201V\201\205\201X\201\206\201Z$\210\201V\201\207\201X\201\206\201Z$\210\201V\201\210\201X\201\211\201Z$\210\201V\201\212\201X\201\211\201Z$\210\201V\201\213\201X\201\214\201Z$\210\201V\201\215\201X\201\214\201Z$\210\201V\201\216\201X\201\217\201Z$\210\201V\201\220\201X\201\217\201Z$\210\201V\201\221\201X\201\222\201Z$\210\201V\201\223\201X\201\222\201Z$\210\201V\201\224\201X\201\225\201Z$\210\201V\201\226\201X\201\225\201Z$\210\201V\201\227\201\230\201\231\201Z$\210\201V\201\232\201\230\201\231\201Z$\210\201V\201\233\201X\201\234\201Z$\210\201V\201\235\201X\201\236\201Z$\210\201V\201\237\201\240\201\241\201Z$\210\201V\201\242\201\240\201\243\201Z$\210\201\244\201\245!\207" [current-load-list menu-bar-ediff-menu menu-bar-ediff-merge-menu menu-bar-epatch-menu menu-bar-ediff-misc-menu purify-flag featurep menu-bar default-boundp set-default make-sparse-keymap "Ediff Miscellanea" "Apply Patch" "Merge" "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) [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-cust] ("Customize Ediff" . ediff-customize) [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)