;ELC ;;; Compiled ;;; in Emacs version 27.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. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (byte-code "\210\301\302\303\304\305DD\306\307\310\311\312&\210\313\314\315\316!\203\316\202\317\"\210\313\320\315\321!\203,\321\202-\322\"\207" [noninteractive custom-declare-variable ediff-keep-tmp-versions funcall function #[0 "\300\207" [nil] 1] "If t, do not delete temporary previous versions for the files on which\ncomparison or merge operations are being performed." :type boolean :group ediff-vers 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] 8) #@82 Return the version level of the latest version of FILE in repository. (fn FILE) (defalias 'ediff-vc-latest-version #[257 "\300\301!\203\n\301!\207\302\303\"\206(\304!\203$\305\304!\306#\210\302\303\"\207\307\310\"\207" [fboundp vc-latest-version vc-file-getprop vc-latest-revision vc-backend vc-call-backend state error "File %s is not under version control"] 5 (#$ . 991)]) #@42 (fn REV1 REV2 &optional STARTUP-HOOKS) (defalias 'ediff-vc-internal #[770 "\300C\300C\300\211\301\230\203\302\303 !\262\304 \305\306\307\310\311!\312\"\313$\216\212\314!\210p\262\303 \240\210)\212\301\230\204=\314!\210p\262\303 \240\210)\305\306\315\310\311 \n\n#\316\"\313$B\262)\210\317\320$\207" [nil #1="" ediff-vc-latest-version buffer-file-name current-window-configuration make-byte-code 0 "\301\300!\207" vconcat vector [set-window-configuration] 2 ediff-vc-revision-other-window "\303\301\242!\210\300\304\230\206\303\302\242!\207" [ediff-delete-version-file #1#] ediff-buffers ediff-revision] 16 (#$ . 1383)]) #@22 (fn &optional REV) (defalias 'rcs-ediff-view-revision #[256 "\302p!\306\307\205 \310PC\"\311!\312\313R\314\315!\210\316!\262r\317!q\210p\320 \210\321\211\322\211\322\323 \210\324\325!\210+\211#\211\211\205P\326!\205P\327\326!!\262\203ar#q\210\330 \210)\202m$\331=\204m\332%!\210\333\"\334!\210r\211q\210\335\336\337\321\322\321\306 &\340D#&\210)\210\314\341!\210\342!\210)\266\202\207" [default-directory buffer-read-only buffer-file-name buffer-undo-list inhibit-modification-hooks inhibit-read-only append ("-p") "-r" file-name-nondirectory ".~" "~" message "Working ..." expand-file-name get-buffer-create kill-all-local-variables nil t erase-buffer run-hooks temp-buffer-setup-hook get-buffer buffer-name fundamental-mode ediff-quit error ediff-rcs-get-output-buffer delete-windows-on apply call-process "co" "-q" "" internal-temp-output-buffer-show standard-output this-command ediff-KILLED-VITAL-BUFFER rcs-default-co-switches] 19 (#$ . 2040) (byte-code "\205\301\302!C\207" [current-prefix-arg read-string "Revision: "] 2)]) #@18 (fn FILE NAME) (defalias 'ediff-rcs-get-output-buffer #[514 "\302!r\211q\210\303\304\305!!\306 \210)\211\207" [buffer-read-only default-directory get-buffer-create nil file-name-directory expand-file-name erase-buffer] 6 (#$ . 3121)]) #@42 (fn REV1 REV2 &optional STARTUP-HOOKS) (defalias 'ediff-rcs-internal #[770 "\300\211\301 \302\303\304\305\306!\307\"\310$\216\311\230\203p\202\312!\262\312!\262)\210\313\314$\207" [nil current-window-configuration make-byte-code 0 "\301\300!\207" vconcat vector [set-window-configuration] 2 "" rcs-ediff-view-revision ediff-buffers ediff-revision] 12 (#$ . 3368)]) #@73 (fn REV1 REV2 ANCESTOR-REV &optional STARTUP-HOOKS MERGE-BUFFER-FILE) (defalias 'ediff-vc-merge-internal #[1283 "\301\211\211\302 \303\304\305\306\307!\310\"\311$\216\212\312 !\210p\262)\212\313\230\204(\312!\210p\262)\203G\212\313\230\203>\314!\262\312!\210p\262)\300!\313\230?\205U\300!\313\230\206_??\205f\300!\303\304\315\306\307#\316\"\311$\266\203B\262)\210\203\221\317\320 &\202\232\321\322%\207" [buffer-file-name nil current-window-configuration make-byte-code 0 "\301\300!\207" vconcat vector [set-window-configuration] 2 ediff-vc-revision-other-window "" ediff-vc-working-revision "\303\300!\210\301\203\f\303\301!\210\302\205\303\302!\207" [ediff-delete-version-file] ediff-merge-buffers-with-ancestor ediff-merge-revisions-with-ancestor ediff-merge-buffers ediff-merge-revisions] 20 (#$ . 3755)]) #@73 (fn REV1 REV2 ANCESTOR-REV &optional STARTUP-HOOKS MERGE-BUFFER-FILE) (defalias 'ediff-rcs-merge-internal #[1283 "\300\211\211\301 \302\303\304\305\306!\307\"\310$\216\311 !\262\312\230\203\"p\202&\311!\262\205<\312\230\2038p\202<\311!\262)\210\203R\313\314 &\202[\315\316%\207" [nil current-window-configuration make-byte-code 0 "\301\300!\207" vconcat vector [set-window-configuration] 2 rcs-ediff-view-revision "" ediff-merge-buffers-with-ancestor ediff-merge-revisions-with-ancestor ediff-merge-buffers ediff-merge-revisions] 15 (#$ . 4633)]) #@13 (fn FILE) (defalias 'ediff-delete-version-file #[257 "\206\301!\207" [ediff-keep-tmp-versions delete-file] 3 (#$ . 5224)]) (provide 'ediff-vers)