;ELC ;;; compiled by kwzh@nutrimat.gnu.ai.mit.edu on Wed Jul 17 15:42:32 1996 ;;; from file /gd/gnu/emacs/19.0/lisp/ediff-vers.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-vers.el' was compiled for Emacs 19.29 or later")) (byte-code " B B B B B" [rcs-default-co-switches current-load-list sc-mode cvs-shell cvs-program cvs-cookie-handle] 2) (defalias 'vc-ediff-internal #[(rev1 rev2 &optional startup-hooks) "!p )ɘ!!p )\fDɘ DEF B \n  $," [nil rev2buf rev1buf file2 file1 vc-version-other-window rev1 buffer-file-name rev2 "" lambda delete-file or startup-hooks ediff-buffers ediff-revision] 7]) (defalias 'rcs-ediff-view-revision #[(&optional rev) "p!\f\fPC\" !\fR\n! !\n \n\"!q D#&*!\n+" [buffer-file-name filename append ("-p") rev "-r" switches file-name-nondirectory ".~" "~" buff message "Working ..." expand-file-name ediff-rcs-get-output-buffer output-buffer delete-windows-on apply call-process "co" nil t rcs-default-co-switches "-q" ""] 12 nil (list (if current-prefix-arg (read-string "Revision: ")))]) (defalias 'ediff-rcs-get-output-buffer #[(file name) " !\fq !!\n )\f*" [fundamental-mode default-major-mode get-buffer-create name buf nil buffer-read-only file-name-directory expand-file-name file default-directory erase-buffer] 3]) (defalias 'rcs-ediff-internal #[(rev1 rev2 &optional startup-hooks) "\np ! !\f $*" [rev2 "" rcs-ediff-view-revision rev1 rev1buf rev2buf ediff-buffers startup-hooks ediff-revision] 5]) (defalias 'generic-sc-get-latest-rev #[nil "=\n!!" [sc-mode CCASE eval "main/LATEST" ""] 2]) (defalias 'generic-sc-ediff-internal #[(rev1 rev2 &optional startup-hooks) "  Ę  !p)Ę&!p)\n  $*" [nil rev2buf rev1buf rev1 "" generic-sc-get-latest-rev sc-visit-previous-revision rev2 ediff-buffers startup-hooks ediff-revision] 5]) (defalias 'vc-ediff-merge-internal #[(rev1 rev2 ancestor-rev &optional startup-hooks) " !p)ǘ!p)3ǘ0!p) !Dǘ\n!DEǘ? !DF B j \n  %q \n $+" [nil ancestor-buf buf2 buf1 vc-version-other-window rev1 rev2 "" ancestor-rev lambda delete-file buffer-file-name or startup-hooks ediff-merge-buffers-with-ancestor ediff-merge-revisions-with-ancestor ediff-merge-buffers ediff-merge-revisions] 10]) (defalias 'rcs-ediff-merge-internal #[(rev1 rev2 ancestor-rev &optional startup-hooks) " !ǘp!.ǘ*p.!? \n \n%F \n\n$+" [nil ancestor-buf buf2 buf1 rcs-ediff-view-revision rev1 rev2 "" ancestor-rev ediff-merge-buffers-with-ancestor startup-hooks ediff-merge-revisions-with-ancestor ediff-merge-buffers ediff-merge-revisions] 6]) (defalias 'generic-sc-ediff-merge-internal #[(rev1 rev2 ancestor-rev &optional startup-hooks) "\fŘ \f!p)Ř$!p) < Ř9 !p) L \n  %S \n $+" [nil ancestor-buf buf2 buf1 rev1 "" generic-sc-get-latest-rev sc-visit-previous-revision rev2 ancestor-rev ediff-merge-buffers-with-ancestor startup-hooks ediff-merge-revisions-with-ancestor ediff-merge-buffers ediff-merge-revisions] 6]) (defalias 'pcl-cvs-ediff-internal #[(rev1 rev2 &optional startup-hooks) "pp!!\n˘#\n \n\" ˘5:  \"\f! !\nD ˘ DEFB\f $." [nil file2 file1 buf2 buf1 orig-file-name orig-buf buffer-file-name error "Current buffer is not visiting any file" rev1 "" ediff-pcl-cvs-view-revision rev2 lambda delete-file or startup-hooks ediff-buffers ediff-revision] 7]) (defalias 'pcl-cvs-ediff-merge-internal #[(rev1 rev2 ancestor-rev &optional startup-hooks) "pp!! ʘ  \f \"\fʘ1 6\f\f\" ;N ʘH M\f \" !D\fʘ\n!DE ʘ ? !DFB \n % \n$-" [nil ancestor-buf buf2 buf1 orig-file-name orig-buf buffer-file-name error "Current buffer is not visiting any file" rev1 "" ediff-pcl-cvs-view-revision rev2 ancestor-rev lambda delete-file or startup-hooks ediff-merge-buffers-with-ancestor ediff-merge-revisions-with-ancestor ediff-merge-buffers ediff-merge-revisions] 10]) (defalias 'ediff-pcl-cvs-view-revision #[(file rev) " Q!\f!  \"!\nˉ 0 Q1\f&RLUR\" ^ \"b!\f!*" [make-temp-name ediff-temp-file-prefix "ediff_" rev temp-name cvs-kill-buffer-visiting message "Retrieving revision %s..." "Retrieving latest revision..." call-process cvs-shell nil "-c" cvs-program " update -p " "-r " " " "" file " > " res 0 error "Failed to retrieve revision: %s" "Retrieving revision %s... Done." "Retrieving latest revision... Done." find-file-noselect] 13]) (defalias 'cvs-run-ediff-on-file-descriptor #[(tin) " \n\" ! ! >! >> !\" ! !! !%R =R! !!$;]! ;g !," [tin-cookie cvs-cookie-handle tin fileinfo cvs-fileinfo->type type cvs-retrieve-revision-to-tmpfile tmp-file nil ancestor-file (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-merge-buffers cvs-fileinfo->full-path ediff-merge-revisions delete-file] 6]) (provide (quote ediff-vers))