;ELC ;;; Compiled by rms@psilocin.gnu.org on Mon May 4 23:32:05 1998 ;;; from file /gd/gnu/emacs/lisp/ediff-vers.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-vers.el' was compiled for Emacs 19.29 or later")) (byte-code "\301B\302B\303B\304B\305B\306B\301\207" [current-load-list 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) "\306\211\211\211\212\307\f!\210p\310 )\212 \311\230\204\307 !\210p\310 )\312\306\313 D\314 \311\230\313\nDEFB\315 \316$,\207" [rev2buf rev1buf file2 file1 rev1 rev2 nil vc-version-other-window buffer-file-name "" lambda delete-file or ediff-buffers ediff-revision startup-hooks] 7]) (defalias 'rcs-ediff-view-revision #[(&optional rev) "\306p!\307\310 \205\311 PC\"\312!\313 \314R\315\316!\210\317! \220\320 \"\321\f!\210\212\fq\210\322\323\324\325\326\325\307\n \327D#&\210*\315\330!\210 \221+\207" [filename rev switches buff output-buffer rcs-default-co-switches buffer-file-name append ("-p") "-r" file-name-nondirectory ".~" "~" message "Working ..." expand-file-name ediff-rcs-get-output-buffer delete-windows-on apply call-process "co" nil t "-q" ""] 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) "\305\230\203\np\202 \306!\306 !\307\n \f\310$*\207" [rev2 rev1 rev1buf rev2buf startup-hooks "" rcs-ediff-view-revision 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\212\307 !\210p)\212\f\310\230\204\307\f!\210p) \203.\212 \310\230\204+\307 !\210p)\311\306\312\313\n!D\314\f\310\230\312\313 !DE\314 \310\230 ?\312\313!DF\257B \203d\315\n \316&\202m\317\n \320%+\207" [ancestor-buf buf2 buf1 rev1 rev2 ancestor-rev nil vc-version-other-window "" lambda delete-file buffer-file-name or ediff-merge-buffers-with-ancestor ediff-merge-revisions-with-ancestor ediff-merge-buffers ediff-merge-revisions startup-hooks merge-buffer-file] 10]) (defalias 'ediff-rcs-merge-internal #[(rev1 rev2 ancestor-rev &optional startup-hooks merge-buffer-file) "\306\211\211\307 !\f\310\230\203p\202\307\f! \205) \310\230\203&p\202)\307 ! \203<\311\n  \312&\202E\313\n  \314%+\207" [ancestor-buf buf2 buf1 rev1 rev2 ancestor-rev nil rcs-ediff-view-revision "" ediff-merge-buffers-with-ancestor ediff-merge-revisions-with-ancestor ediff-merge-buffers ediff-merge-revisions startup-hooks merge-buffer-file] 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 'ediff-pcl-cvs-internal #[(rev1 rev2 &optional startup-hooks) "p\306\211\211\211\211\307p!\211\204\310\311!\210\312\230\203\"\306\313\f\"\312\230\2033 \2028\313\f\"\307 !\307\n!\314\306\315 D\316\312\230\315DEFB\317 \n\320$.\207" [file2 file1 buf2 buf1 orig-file-name orig-buf nil buffer-file-name error "Current buffer is not visiting any file" "" ediff-pcl-cvs-view-revision lambda delete-file or ediff-buffers ediff-revision rev1 rev2 startup-hooks] 7]) (defalias 'ediff-pcl-cvs-merge-internal #[(rev1 rev2 ancestor-rev &optional startup-hooks merge-buffer-file) "p\306\211\211\211\307p!\211\204\310\311!\210 \312\230\203\306\313 \"\312\230\203.\f\2023\313 \";\203K\312\230\203E\f\202J\313 \"\314\306\315\307\n!D\316\312\230\315\307 !DE\316\312\230?\315\307!DF\257B\203\204\317\n \320&\202\215\321\n \322%-\207" [ancestor-buf buf2 buf1 orig-file-name orig-buf rev1 nil buffer-file-name error "Current buffer is not visiting any file" "" ediff-pcl-cvs-view-revision lambda delete-file or ediff-merge-buffers-with-ancestor ediff-merge-revisions-with-ancestor ediff-merge-buffers ediff-merge-revisions rev2 ancestor-rev startup-hooks merge-buffer-file] 10]) (defalias 'ediff-pcl-cvs-view-revision #[(file rev) "\306\307 Q!\310\n!\210 \203\311\312 \"\210\202\311\313!\210\314 \315\211\211\316\f\317 \203.\320 \321Q\202/\322 \323\n\260&\211\203O\250\203I\324U\204O\325\326\"\210 \203[\311\327 \"\210\202_\311\330!\210\331\n!*\207" [ediff-temp-file-prefix rev temp-name cvs-shell cvs-program file make-temp-name "ediff_" cvs-kill-buffer-visiting message "Retrieving revision %s..." "Retrieving latest revision..." call-process nil "-c" " update -p " "-r " " " "" " > " 0 error "Failed to retrieve revision: %s" "Retrieving revision %s... Done." "Retrieving latest revision... Done." find-file-noselect res] 13]) (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)