;ELC ;;; Compiled by pot@pot.cnuce.cnr.it on Tue Mar 18 15:38:34 2003 ;;; from file /home/pot/gnu/emacs-pretest.new/lisp/ediff-vers.el ;;; in Emacs version 21.3 ;;; with bytecomp version 2.85.4.1 ;;; 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-vers.el' was compiled for Emacs 19.29 or later")) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (byte-code "\302B\303B\304B\305B\306B\307B \207" [current-load-list noninteractive rcs-default-co-switches sc-mode cvs-shell cvs-program cvs-cookie-handle ediff-temp-file-prefix] 2) (defalias 'ediff-vc-internal #[(rev1 rev2 &optional startup-hooks) "\305\211\211\211\306\213\210\307 \f\310$,\207" [rev2buf rev1buf file2 file1 startup-hooks nil ((byte-code "\212\306!\210p\307 )\212 \310\230\204\306 !\210p\307 )\311\312\313\nD\314 \310\230\313 DEF B \312\207" [rev1 rev1buf file1 rev2 rev2buf file2 vc-version-other-window buffer-file-name "" lambda nil delete-file or startup-hooks] 7)) ediff-buffers ediff-revision] 5]) (defalias 'rcs-ediff-view-revision #[(&optional rev) "\306p!\307\310 \205\311 PC\"\312!\313 \314R\315\316!\210\317! \220\f\203?\320\f!\203?\321\320\f!!\203?r\fq\210\322 \210)\202J \323=\204J\324!\210\325 \"\326!\210\212q\210\327\330\331\332\333\332\307\n \334D#&\210*\315\335!\210 \221+\207" [filename rev switches buff standard-output this-command buffer-file-name append ("-p") "-r" file-name-nondirectory ".~" "~" message "Working ..." expand-file-name get-buffer buffer-name fundamental-mode ediff-quit error ediff-rcs-get-output-buffer delete-windows-on apply call-process "co" nil t "-q" "" ediff-KILLED-VITAL-BUFFER output-buffer rcs-default-co-switches] 12 nil (list (if current-prefix-arg (read-string "Revision: ")))]) (defalias 'ediff-rcs-get-output-buffer #[(file name) "\306\307 !\212\nq\210\310\311\312\f!!\313 \210)\n*\207" [default-major-mode name buf buffer-read-only file default-directory fundamental-mode get-buffer-create nil file-name-directory expand-file-name erase-buffer] 3]) (defalias 'ediff-rcs-internal #[(rev1 rev2 &optional startup-hooks) "\303\211\304\213\210\305 \n\306$*\207" [rev1buf rev2buf startup-hooks nil ((byte-code "\304\230\203\np\202 \305!\305\n!\305\207" [rev2 rev2buf rev1 rev1buf "" rcs-ediff-view-revision] 2)) ediff-buffers ediff-revision] 5]) (defalias 'generic-sc-get-latest-rev #[nil "\301=\203\n\302\303!\207\302\304!\207" [sc-mode CCASE eval "main/LATEST" ""] 2]) (defalias 'ediff-generic-sc-internal #[(rev1 rev2 &optional startup-hooks) "\305\211\212\n\203\n\306\230\203\307 \310\n!\210p)\212 \306\230\204$\310 !\210p)\311 \f\312$*\207" [rev2buf rev1buf rev1 rev2 startup-hooks nil "" generic-sc-get-latest-rev sc-visit-previous-revision ediff-buffers ediff-revision] 5]) (defalias 'ediff-vc-merge-internal #[(rev1 rev2 ancestor-rev &optional startup-hooks merge-buffer-file) "\306\211\211\307\213\210 \203\310\n \f\311 &\202 \312\n \f\313 %+\207" [ancestor-buf buf2 buf1 ancestor-rev startup-hooks merge-buffer-file nil ((byte-code "\212\306!\210p)\212\n\307\230\204\306\n!\210p)\f\203-\212\f\307\230\203%\310 !\306\f!\210p )\311\312\313\305 !D\314\n\307\230\313\305 !DE\314\f\307\230\f?\313\305 !DF\257B\312\207" [rev1 buf1 rev2 buf2 ancestor-rev buffer-file-name vc-version-other-window "" vc-workfile-version lambda nil delete-file or ancestor-buf startup-hooks] 10)) ediff-merge-buffers-with-ancestor ediff-merge-revisions-with-ancestor ediff-merge-buffers ediff-merge-revisions] 7]) (defalias 'ediff-rcs-merge-internal #[(rev1 rev2 ancestor-rev &optional startup-hooks merge-buffer-file) "\306\211\211\307\213\210 \203\310\n \f\311 &\202 \312\n \f\313 %+\207" [ancestor-buf buf2 buf1 ancestor-rev startup-hooks merge-buffer-file nil ((byte-code "\306!\n\307\230\203p\202\306\n!\f\205#\f\307\230\203 p\202#\306\f!\306\207" [rev1 buf1 rev2 buf2 ancestor-rev ancestor-buf rcs-ediff-view-revision ""] 2)) ediff-merge-buffers-with-ancestor ediff-merge-revisions-with-ancestor ediff-merge-buffers ediff-merge-revisions] 7]) (defalias 'ediff-generic-sc-merge-internal #[(rev1 rev2 ancestor-rev &optional startup-hooks merge-buffer-file) "\306\211\211\212 \307\230\203\310 \311 !\210p)\212\f\307\230\204\"\311\f!\210p) \2037\212 \307\230\2044\311 !\210p) \203I\312\n \313&\202R\314\n \315%+\207" [ancestor-buf buf2 buf1 rev1 rev2 ancestor-rev nil "" generic-sc-get-latest-rev sc-visit-previous-revision ediff-merge-buffers-with-ancestor ediff-merge-revisions-with-ancestor ediff-merge-buffers ediff-merge-revisions startup-hooks merge-buffer-file] 7]) (defalias 'cvs-run-ediff-on-file-descriptor #[(tin) "\306 \"\307\n!\310\n!\311\312\n!!\313 \314>\204 \315\316!\210 \317>\203B\310\n\320\n!\"\321\322\f!\322\323\n!!\322!\313\324%\210\202U \325=\203U\326\322\f!\322\327\n!!\313\330$\210\f;\203^\331\f!\210;\205h\331!-\207" [cvs-cookie-handle tin fileinfo type tmp-file default-directory tin-cookie cvs-fileinfo->type cvs-retrieve-revision-to-tmpfile file-name-as-directory cvs-fileinfo->dir nil (MERGED CONFLICT MODIFIED) error "Can only merge `Modified', `Merged' or `Conflict' files" (MERGED CONFLICT) cvs-fileinfo->base-revision ediff-merge-buffers-with-ancestor find-file-noselect cvs-fileinfo->backup-file ediff-merge-revisions-with-ancestor MODIFIED ediff-buffers cvs-fileinfo->full-path ediff-revisions delete-file ancestor-file] 6]) (provide 'ediff-vers)