;ELC ;;; Compiled by buildd@akateko.buildd on Fri Oct 25 13:49:52 2013 ;;; from file /build/buildd/emacs23-23.4+1/debian/build-x/lisp/ediff-vers.el ;;; in Emacs version 23.4.1 ;;; with all optimizations. ;;; This file uses dynamic docstrings, first added in Emacs 19.29. ;;; This file does not contain utf-8 non-ASCII characters, ;;; and so can be loaded in Emacs versions earlier than 23. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; noninteractive #@124 If t, do not delete temporary previous versions for the files on which comparison or merge operations are being performed. (custom-declare-variable 'ediff-keep-tmp-versions 'nil '(#$ . 556) :type 'boolean :group 'ediff-vers) (byte-code "\300\301\302\303!\203\f\303\202 \304\"\210\300\305\302\306!\203\306\202\307\"\207" [defalias ediff-vc-revision-other-window fboundp vc-revision-other-window vc-version-other-window ediff-vc-working-revision vc-working-revision vc-workfile-version] 4) #@71 Return the version level of the latest version of FILE in repository. (defalias 'ediff-vc-latest-version #[(file) "\301\302!\203\n\302!\207\303\304\"\206(\305!\203$\306\305!\307#\210\303\304\"\207\310\311\"\207" [file fboundp vc-latest-version vc-file-getprop vc-latest-revision vc-backend vc-call-backend state error "File %s is not under version control"] 4 (#$ . 1056)]) (defalias 'ediff-vc-internal #[(rev1 rev2 &optional startup-hooks) "\306\211\211\211\f\307\230\203\310\311 !\312\213\210\313  \314$,\207" [rev2buf rev1buf file2 file1 rev1 startup-hooks nil #1="" ediff-vc-latest-version buffer-file-name ((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 ediff-vc-revision-other-window buffer-file-name #1# lambda nil ediff-delete-version-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!\210rq\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) "\305!r q\210\306\307\310 !!\311 \210) )\207" [name buf buffer-read-only file default-directory 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 '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 ediff-vc-revision-other-window "" ediff-vc-working-revision lambda nil ediff-delete-version-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-delete-version-file #[(file) "\206\302 !\207" [ediff-keep-tmp-versions file delete-file] 2]) (provide 'ediff-vers)