Current File : //usr/local/share/emacs/27.2/lisp/vc/ediff.elc
;ELC
;;; Compiled
;;; in Emacs version 27.2
;;; 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.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
#@30 The current version of Ediff
(defconst ediff-version "2.81.6" (#$ . 408))
(byte-code "\300\301!\210\300\302!\210\300\303!\210\304\305\306\307\310\311\312\313&\210\314\315\316\317\320DD\321\322\323%\207" [require ediff-util ediff-init ediff-mult custom-declare-group ediff nil "Comprehensive visual interface to `diff' and `patch'." :tag "Ediff" :group tools custom-declare-variable ediff-use-last-dir funcall function #[0 "\300\207" [nil] 1] "If t, Ediff will use previous directory as default when reading file name." :type boolean] 8)
(defvar ediff-last-dir-A nil)
(defvar ediff-last-dir-B nil)
(defvar ediff-last-dir-C nil)
(defvar ediff-last-dir-ancestor nil)
(defvar ediff-last-merge-autostore-dir nil)
(defalias 'ediff-set-read-only-in-buf-A #[0 "\211\205 \304!\205 \305\304!!\262\203 rq\210\306\211)\207\n\307=\206' \310 !\207" [ediff-buffer-A buffer-read-only this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name t ediff-quit error] 4])
#@33
(fn &optional DEFAULT FILENO)
(defalias 'ediff-get-default-file-name #[512 "\301=\203P \302\303\304\"\3051 \306\307!0\202 \210\303\303\211\211\250\204\" \310\262;\203. B\262;\203> \311!\204> B\262\244\262\234\262\211\206O \207;\203W \207\312p!\205b \313\312p!!\207" [major-mode dired-mode dired-get-filename nil no-error (error) dired-get-marked-files no-dir 0 file-directory-p buffer-file-name file-name-nondirectory] 9 (#$ . 1378)])
#@202 Run Ediff on a pair of files, FILE-A and FILE-B.
STARTUP-HOOKS is a list of functions that Emacs calls without
arguments after setting up the Ediff buffers.
(fn FILE-A FILE-B &optional STARTUP-HOOKS)
(defalias 'ediff-files #[770 "\300\301!\203 \302\303!\"\202 \304\305%\207" [ediff-files-internal file-directory-p expand-file-name file-name-nondirectory nil ediff-files] 9 (#$ . 1849) (byte-code "\203 \202 \n\304\211\305\306\307 \310$\211\262\305\311\203 \202\" \312!\211\262\313\314\315\316\317 !\n\"!\"\210\307\320\"#D\207" [ediff-use-last-dir ediff-last-dir-A default-directory ediff-last-dir-B nil ediff-read-file-name "File A to compare" ediff-get-default-file-name no-dirs "File B to compare" file-name-directory add-to-history file-name-history ediff-abbreviate-file-name expand-file-name file-name-nondirectory 1] 13)])
#@214 Run Ediff on three files, FILE-A, FILE-B, and FILE-C.
STARTUP-HOOKS is a list of functions that Emacs calls without
arguments after setting up the Ediff buffers.
(fn FILE-A FILE-B FILE-C &optional STARTUP-HOOKS)
(defalias 'ediff-files3 #[1027 "\300\301!\203 \302\303!\"\202 \301!\203% \302\303!\"\202& \304%\207" [ediff-files-internal file-directory-p expand-file-name file-name-nondirectory ediff-files3] 10 (#$ . 2709) (byte-code "\203 \202 \n\305\211\211\211\306\307\310 \311$\211\262\306\312\203\" \202% \313!\211\262\314\315\316\317\320\n!\f\"!\"\210\310\321\"#\211\262\306\322\203I \f\202L \313!\211\262\314\315\316\317\320\n!\f\"!\"\210\310\323\"#E\207" [ediff-use-last-dir ediff-last-dir-A default-directory ediff-last-dir-B ediff-last-dir-C nil ediff-read-file-name "File A to compare" ediff-get-default-file-name no-dirs "File B to compare" file-name-directory add-to-history file-name-history ediff-abbreviate-file-name expand-file-name file-name-nondirectory 1 "File C to compare" 2] 16)])
(defalias 'ediff3 'ediff-files3)
#@111 Name of file where buffer's content was saved.
Only non-nil in "magic" buffers such as those of remote files.
(defvar ediff--magic-file-name nil (#$ . 3791))
(make-variable-buffer-local 'ediff--magic-file-name)
(defvar ediff--startup-hook nil)
#@542 Visit FILE and arrange its buffer to Ediff's liking.
FILE is the file name.
LAST-DIR is the directory variable symbol where FILE's
directory name should be returned. May push to `ediff--startup-hook'
functions to be executed after `ediff-startup' is finished.
`ediff-find-file' arranges that the temp files it might create will be
deleted.
Returns the buffer into which the file is visited.
Also sets `ediff--magic-file-name' to indicate where the file's content
has been saved (if not in `buffer-file-name').
(fn FILE &optional LAST-DIR)
(defalias 'ediff-find-file #[513 "\302!\303!\304!\204 \305\306\"\210\202 \307!\203 \305\310\"\210\311!\262\2031 \311\312!!L\210r\313!q\210~\210\314\203[ \315\316!\210\317p\"\320\321\322\323\324\325\326!\327\"\330$\"\210\202\200 \331!\331 !\232\204} \317p\"\320\321\322\323\324\325\326!\332\"\330$\"\210\202\200 \315 \210p)\207" [ediff--magic-file-name buffer-file-name ediff-filename-magic-p file-name-nondirectory file-readable-p user-error "File `%s' does not exist or is not readable" file-directory-p "File `%s' is a directory" expand-file-name file-name-directory find-file-noselect nil ediff-verify-file-buffer magic ediff-make-temp-file add-hook ediff--startup-hook make-byte-code 0 "\301\300!\207" vconcat vector [delete-file] 2 file-truename [delete-file]] 13 (#$ . 4042)])
#@12
(fn BUF)
(defalias 'ediff--buffer-file-name #[257 "\211\205 r\211q\210\206
)\207" [ediff--magic-file-name buffer-file-name] 2 (#$ . 5399)])
#@80
(fn FILE-A FILE-B FILE-C STARTUP-HOOKS JOB-NAME &optional MERGE-BUFFER-FILE)
(defalias 'ediff-files-internal #[1541 "\230\203\n \301\302!\210;\203% \230\203 \301\303!\204% \230\203% \301\304!\210\305\211\211\306\307 \"\210\310\n\311\"\262\306\307\n\"\210\310 \312\"\262;\203c \306\307 \"\210\310\313=\203_ \314\202` \315\"\262\316\317!\317!\317!\320BC
& )\207" [ediff--startup-hook error "Files A and B are the same" "Files A and C are the same" "Files B and C are the same" nil message "Reading file %s ... " ediff-find-file ediff-last-dir-A ediff-last-dir-B ediff-merge-files-with-ancestor ediff-last-dir-ancestor ediff-last-dir-C ediff-setup ediff--buffer-file-name ediff-job-name] 20 (#$ . 5551)])
(defalias 'ediff 'ediff-files)
#@167 Start ediff between current buffer and its file on disk.
This command can be used instead of `revert-buffer'. If there is
nothing to revert then this command fails.
(defalias 'ediff-current-file #[0 "\306=\203 \307=\203 \n\203 \310 \204 \311p!\203 \312\313!\210\314 \2051 \2051 \315 !\2051 \316\317!\211\2039 \202: \f\320P\321!
\204I \312\322!\210\203T \323!\210\324\262\325!\262rq\210\326!\210\211 \210)\327p\"\207" [revert-buffer-function revert-buffer-insert-file-contents-function buffer-file-number buffer-auto-save-file-name buffer-file-name major-mode revert-buffer--default revert-buffer-insert-file-contents--default-function buffer-modified-p verify-visited-file-modtime error "Nothing to revert" recent-auto-save-p file-readable-p y-or-n-p "Buffer has been auto-saved recently. Compare with auto-save file? " "FILE=" get-buffer "Buffer does not seem to be associated with any file" kill-buffer nil get-buffer-create insert-file-contents ediff-buffers] 8 (#$ . 6330) nil])
#@171 Run Ediff on FILE and its backup file.
Uses the latest backup, if there are several numerical backups.
If this file is a backup, `ediff' it with its original.
(fn FILE)
(defalias 'ediff-backup #[257 "\300\301!\210\302\211\303!\203 \262\304!\262\202& \305!\206! \306\307\"\262\262\310\"\207" [require diff nil backup-file-name-p file-name-sans-versions diff-latest-backup-file error "No backup found for %s" ediff-files] 6 (#$ . 7342) (byte-code "\300\301!C\207" [read-file-name "Ediff (file with backup): "] 2)])
#@492 Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B.
STARTUP-HOOKS is a list of functions that Emacs calls without
arguments after setting up the Ediff buffers. JOB-NAME is a
symbol describing the Ediff job type; it defaults to
`ediff-buffers', but can also be one of
`ediff-merge-files-with-ancestor', `ediff-last-dir-ancestor',
`ediff-last-dir-C', `ediff-buffers3', `ediff-merge-buffers', or
`ediff-merge-buffers-with-ancestor'.
(fn BUFFER-A BUFFER-B &optional STARTUP-HOOKS JOB-NAME)
(defalias 'ediff-buffers #[1026 "\211\204 \300\262\301\302%\207" [ediff-buffers ediff-buffers-internal nil] 10 (#$ . 7876) (byte-code "\300\301\302\303\304!\305#\211\262\301\306\307 \310\311\312\313\314!\315\"\316$\216\317\320!\210)\210\303!\305#D\207" [nil read-buffer "Buffer A to compare: " ediff-other-buffer "" t "Buffer B to compare: " current-window-configuration make-byte-code 0 "\301\300!\207" vconcat vector [set-window-configuration] 2 other-window 1] 11)])
(defalias 'ebuffers 'ediff-buffers)
#@508 Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C.
STARTUP-HOOKS is a list of functions that Emacs calls without
arguments after setting up the Ediff buffers. JOB-NAME is a
symbol describing the Ediff job type; it defaults to
`ediff-buffers3', but can also be one of
`ediff-merge-files-with-ancestor', `ediff-last-dir-ancestor',
`ediff-last-dir-C', `ediff-buffers', `ediff-merge-buffers', or
`ediff-merge-buffers-with-ancestor'.
(fn BUFFER-A BUFFER-B BUFFER-C &optional STARTUP-HOOKS JOB-NAME)
(defalias 'ediff-buffers3 #[1283 "\211\204 \300\262\301%\207" [ediff-buffers3 ediff-buffers-internal] 11 (#$ . 8889) (byte-code "\300\211\301\302\303\304!\305#\211\262\301\306\307 \310\311\312\313\314!\315\"\316$\216\317\320!\210)\210\303!\305#\211\262\301\321\307 \310\311\312\313\314!\322\"\316$\216\317\320!\210)\210\303D!\305#E\207" [nil read-buffer "Buffer A to compare: " ediff-other-buffer "" t "Buffer B to compare: " current-window-configuration make-byte-code 0 "\301\300!\207" vconcat vector [set-window-configuration] 2 other-window 1 "Buffer C to compare: " [set-window-configuration]] 13)])
(defalias 'ebuffers3 'ediff-buffers3)
#@77
(fn BUF-A BUF-B BUF-C STARTUP-HOOKS JOB-NAME &optional MERGE-BUFFER-FILE)
(defalias 'ediff-buffers-internal #[1541 "\302\303!!\302\303!!\211\205 \303!\205 \304\303!!\262\211\205( \302\303 !!\305C\305C\305C\306\307\310\311\312#\313\"\314$\216\f\211\205P \303!\205P \304\303!!\262\204[ \315\316\"\210 \211\205l \303!\205l \304\303!!\262\204w \315\316
\"\210 \203\210 \204\210 \315\316\f\"\210);\203\225 \317!\262;\203\240 \317!\262;\203\252 \317!\262\320 \"\240\210\320
\"\240\210\203\311 \211\320\f\"\240\210\321\303!\242\303!\242 \205\337 \303!\242\306\307\322\311\312#\323\"\314$B\300BC& )\207" [ediff-job-name ediff-3way-comparison-job buffer-file-name get-buffer buffer-name nil make-byte-code 0 "\300\242;\203 \303\300\242!\203 \304\300\242!\210\301\242;\203$ \303\301\242!\203$ \304\301\242!\210\302\242;\2055 \303\302\242!\2055 \304\302\242!\207" vconcat vector [file-exists-p delete-file] 2 user-error "Buffer %S doesn't exist" file-name-nondirectory ediff-make-temp-file ediff-setup "\303\300\242!\210\303\301\242!\210\302\242;\205 \303\302\242!\207" [delete-file]] 28 (#$ . 10061)])
(defalias 'ediff-get-default-directory-name #[0 "\203 \207\n\304=\203! \305\306\307\"\211;\203 \310!\203 \211\202 \207 \207" [ediff-use-last-dir ediff-last-dir-A major-mode default-directory dired-mode dired-get-filename nil noerror file-directory-p] 3])
#@239 Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
the same name in both. The third argument, REGEXP, is nil or a regular
expression; only file names that match the regexp are considered.
(fn DIR1 DIR2 REGEXP)
(defalias 'ediff-directories #[771 "\300\301\302\303&\207" [ediff-directories-internal nil ediff-files ediff-directories] 10 (#$ . 11508) (byte-code "\303 \304!\305\306\307\305\310$\211\262\306\311 \203 \n\202 \312!\305\310$\313;\203- \314\315\"\202. \316\305\317\304!$E\207" [ediff-default-filtering-regexp ediff-use-last-dir ediff-last-dir-B ediff-get-default-directory-name eval nil read-directory-name "Directory A to compare: " must-match "Directory B to compare: " ediff-strip-last-dir read-string format "Filter filenames through regular expression (default %s): " "Filter filenames through regular expression: " ediff-filtering-regexp-history] 11)])
(defalias 'edirs 'ediff-directories)
#@247 Run Ediff on a directory, DIR1, comparing its files with their revisions.
The second argument, REGEXP, is a regular expression that filters the file
names. Only the files that are under revision control are taken into account.
(fn DIR1 REGEXP)
(defalias 'ediff-directory-revisions #[514 "\300\301\302$\207" [ediff-directory-revisions-internal ediff-revision ediff-directory-revisions] 7 (#$ . 12462) (byte-code "\301 \302!\303\304\305\306$\307;\203 \310\311\"\202 \312\305\313\302!$D\207" [ediff-default-filtering-regexp ediff-get-default-directory-name eval read-directory-name "Directory to compare with revision:" nil must-match read-string format "Filter filenames through regular expression (default %s): " "Filter filenames through regular expression: " ediff-filtering-regexp-history] 9)])
(defalias 'edir-revisions 'ediff-directory-revisions)
#@251 Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
have the same name in all three. The last argument, REGEXP, is nil or a
regular expression; only file names that match the regexp are considered.
(fn DIR1 DIR2 DIR3 REGEXP)
(defalias 'ediff-directories3 #[1028 "\300\301\302&\207" [ediff-directories-internal ediff-files3 ediff-directories3] 11 (#$ . 13331) (byte-code "\304 \305!\306\307\310\306#\211\262\307\311 \203 \n\202 \312!\306\313$\211\262\307\314 \203+ \202. \312!\306\313$\315;\203? \316\317\"\202@ \320\306\321\305!$F\207" [ediff-default-filtering-regexp ediff-use-last-dir ediff-last-dir-B ediff-last-dir-C ediff-get-default-directory-name eval nil read-directory-name "Directory A to compare:" "Directory B to compare:" ediff-strip-last-dir must-match "Directory C to compare:" read-string format "Filter filenames through regular expression (default %s): " "Filter filenames through regular expression: " ediff-filtering-regexp-history] 12)])
(defalias 'edirs3 'ediff-directories3)
#@336 Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
the same name in both. The third argument, REGEXP, is nil or a regular
expression; only file names that match the regexp are considered.
MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
(fn DIR1 DIR2 REGEXP &optional MERGE-AUTOSTORE-DIR)
(defalias 'ediff-merge-directories #[1027 "\300\301\302\303\301&\207" [ediff-directories-internal nil ediff-merge-files ediff-merge-directories] 13 (#$ . 14379) (byte-code "\303 \304!\305\306\307\305\310$\211\262\306\311 \203 \n\202 \312!\305\310$\313;\203- \314\315\"\202. \316\305\317\304!$E\207" [ediff-default-filtering-regexp ediff-use-last-dir ediff-last-dir-B ediff-get-default-directory-name eval nil read-directory-name "Directory A to merge:" must-match "Directory B to merge:" ediff-strip-last-dir read-string format "Filter filenames through regular expression (default %s): " "Filter filenames through regular expression: " ediff-filtering-regexp-history] 11)])
(defalias 'edirs-merge 'ediff-merge-directories)
#@509 Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
without ancestor. The fourth argument, REGEXP, is nil or a regular expression;
only file names that match the regexp are considered.
MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
(fn DIR1 DIR2 ANCESTOR-DIR REGEXP &optional MERGE-AUTOSTORE-DIR)
(defalias 'ediff-merge-directories-with-ancestor #[1284 "\300\301\302\303&\207" [ediff-directories-internal ediff-merge-files-with-ancestor ediff-merge-directories-with-ancestor nil] 14 (#$ . 15461) (byte-code "\304 \305!\306\307\310\306#\211\262\307\311 \203 \n\202 \312!\306\313$\211\262\307\314 \203+ \202. \312!\306\313$\315;\203? \316\317\"\202@ \320\306\321\305!$F\207" [ediff-default-filtering-regexp ediff-use-last-dir ediff-last-dir-B ediff-last-dir-C ediff-get-default-directory-name eval nil read-directory-name "Directory A to merge:" "Directory B to merge:" ediff-strip-last-dir must-match "Ancestor directory:" read-string format "Filter filenames through regular expression (default %s): " "Filter filenames through regular expression: " ediff-filtering-regexp-history] 12)])
#@344 Run Ediff on a directory, DIR1, merging its files with their revisions.
The second argument, REGEXP, is a regular expression that filters the file
names. Only the files that are under revision control are taken into account.
MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
(fn DIR1 REGEXP &optional MERGE-AUTOSTORE-DIR)
(defalias 'ediff-merge-directory-revisions #[770 "\300\301\302\303&\207" [ediff-directory-revisions-internal ediff-merge-revisions ediff-merge-directory-revisions nil] 10 (#$ . 16787) (byte-code "\301 \302!\303\304\305\306$\307;\203 \310\311\"\202 \312\305\313\302!$D\207" [ediff-default-filtering-regexp ediff-get-default-directory-name eval read-directory-name "Directory to merge with revisions:" nil must-match read-string format "Filter filenames through regular expression (default %s): " "Filter filenames through regular expression: " ediff-filtering-regexp-history] 9)])
(defalias 'edir-merge-revisions 'ediff-merge-directory-revisions)
#@358 Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
The second argument, REGEXP, is a regular expression that filters the file
names. Only the files that are under revision control are taken into account.
MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
(fn DIR1 REGEXP &optional MERGE-AUTOSTORE-DIR)
(defalias 'ediff-merge-directory-revisions-with-ancestor #[770 "\300\301\302\303&\207" [ediff-directory-revisions-internal ediff-merge-revisions-with-ancestor ediff-merge-directory-revisions-with-ancestor nil] 10 (#$ . 17795) (byte-code "\301 \302!\303\304\305\306$\307;\203 \310\311\"\202 \312\305\313\302!$D\207" [ediff-default-filtering-regexp ediff-get-default-directory-name eval read-directory-name "Directory to merge with revisions and ancestors:" nil must-match read-string format "Filter filenames through regular expression (default %s): " "Filter filenames through regular expression: " ediff-filtering-regexp-history] 9)])
(byte-code "\300\301\302\"\210\300\303\304\"\207" [defalias edir-merge-revisions-with-ancestor ediff-merge-directory-revisions-with-ancestor edirs-merge-with-ancestor ediff-merge-directories-with-ancestor] 3)
#@89
(fn DIR1 DIR2 DIR3 REGEXP ACTION JOBNAME &optional STARTUP-HOOKS MERGE-AUTOSTORE-DIR)
(defalias 'ediff-directories-internal #[2054 ";\203 \304!\203 \202 \305!\262\230\203' \306\307 \"\210\202R \310=\203> \230\203> \306\311 \"\210\202R \310=\203R \230\203R \306\312 \"\210\211\203` \211;\204` \313\314\"\210\315C\315\203\213 \211\206m \316>\262\203\213 \204\213 \317\320\n\203\202 \202\206 \321\f!\315\322$\262\203\332 ;\203\251 \n\230\203\251 \323\324!\204\332 \306\325!\210\202\332 ;\203\303 \230\203\303 \323\326!\204\332 \306\325!\210\202\332 ;\203\332 \230\203\332 \323\327!\204\332 \306\325!\210\330
&\240\210\331\332\333\334\335\n\"\336\"\337$B\262\340\341\242@\342\343 &\262\344!\207" [ediff-autostore-merges ediff-metajob-name ediff-use-last-dir ediff-last-merge-autostore-dir file-directory-p file-name-directory user-error "Directories A and B are the same: %s" ediff-directories3 "Directories A and C are the same: %s" "Directories B and C are the same: %s" error "%s: Directory for storing merged files must be a string" nil (ediff-merge-directories ediff-merge-directories-with-ancestor ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor ediff-merge-filegroups-with-ancestor) read-directory-name "Save merged files in directory: " ediff-strip-last-dir must-match y-or-n-p "Directory for saving merged files = Directory A. Sure? " "Directory merge aborted" "Directory for saving merged files = Directory B. Sure? " "Directory for saving merged files = Ancestor Directory. Sure? " ediff-intersect-directories make-byte-code 0 "\300\301\242A\211\207" vconcat vector [ediff-session-action-function ediff-dir-difference-list] 2 ediff-prepare-meta-buffer ediff-filegroup-action "*Ediff Session Group Panel" ediff-redraw-directory-group-buffer ediff-show-meta-buffer] 18 (#$ . 19015)])
#@79
(fn DIR1 REGEXP ACTION JOBNAME &optional STARTUP-HOOKS MERGE-AUTOSTORE-DIR)
(defalias 'ediff-directory-revisions-internal #[1540 "\304!\203 \202 \305!\262\211\203 \211;\204 \306\307\"\210\310\211\203I \211\206+ \311>\262\203I \204I \312\313\n\203@ \202D \314\n!\310\315$\262\203d ;\203d \230\203d \316\317!\204d \320\321!\210\322\n$\262\323\324\325\326\327\n!\330\"\331$B\262\332\333\334\335 &\262\336!\207" [ediff-autostore-merges ediff-metajob-name ediff-use-last-dir ediff-last-merge-autostore-dir file-directory-p file-name-directory error "%S: Directory for storing merged files must be a string" nil (ediff-merge-directories ediff-merge-directories-with-ancestor ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor ediff-merge-filegroups-with-ancestor) read-directory-name "Save merged files in directory: " ediff-strip-last-dir must-match y-or-n-p "Directory for saving merged file = directory A. Sure? " user-error "Merge of directory revisions aborted" ediff-get-directory-files-under-revision make-byte-code 0 "\300\211\207" vconcat vector [ediff-session-action-function] 2 ediff-prepare-meta-buffer ediff-filegroup-action "*Ediff Session Group Panel" ediff-redraw-directory-group-buffer ediff-show-meta-buffer] 15 (#$ . 20923)])
#@469 Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
This compares the portions of text visible in each of the two windows.
With prefix argument, DUMB-MODE, or on a non-windowing display, works as
follows:
If WIND-A is nil, use selected window.
If WIND-B is nil, use window next to WIND-A.
STARTUP-HOOKS is a list of functions that Emacs calls without
arguments after setting up the Ediff buffers.
(fn DUMB-MODE &optional WIND-A WIND-B STARTUP-HOOKS)
(defalias 'ediff-windows-wordwise #[1025 "\300\301\302&\207" [ediff-windows ediff-windows-wordwise word-mode] 11 (#$ . 22242) "P"])
#@469 Compare WIND-A and WIND-B, which are selected by clicking, linewise.
This compares the portions of text visible in each of the two windows.
With prefix argument, DUMB-MODE, or on a non-windowing display, works as
follows:
If WIND-A is nil, use selected window.
If WIND-B is nil, use window next to WIND-A.
STARTUP-HOOKS is a list of functions that Emacs calls without
arguments after setting up the Ediff buffers.
(fn DUMB-MODE &optional WIND-A WIND-B STARTUP-HOOKS)
(defalias 'ediff-windows-linewise #[1025 "\300\301\302&\207" [ediff-windows ediff-windows-linewise nil] 11 (#$ . 22854) "P"])
#@65
(fn DUMB-MODE WIND-A WIND-B STARTUP-HOOKS JOB-NAME WORD-MODE)
(defalias 'ediff-windows #[1542 "\204 \300 \204D \301\302!\203 \202! \211\203 \303!\202! \304 \266\202\262\302!\2031 \202= \211\203; \303!\202= \304 \266\202\262\202S \305\301\306#\262\305\307#\262\310!\310!\301\211\211\211\212\311 \312\313\314\315\316!\317\"\307$\216\320\313!\210\321\f!\210\322 \262\323 \262\321 !\210\322 \262\323 \262)\210)\324\f\325#\262\324 \326#\262\327\301&\n\207" [ediff-window-display-p nil window-live-p next-window selected-window ediff-get-window-by-clicking 1 2 window-buffer current-window-configuration make-byte-code 0 "\301\300!\207" vconcat vector [set-window-configuration] sit-for select-window window-start window-end ediff-clone-buffer-for-window-comparison "-Window.A-" "-Window.B-" ediff-regions-internal] 23 (#$ . 23459)])
#@449 Run Ediff on a pair of regions in specified buffers.
BUFFER-A and BUFFER-B are the buffers to be compared.
Regions (i.e., point and mark) can be set in advance or marked interactively.
This function might be slow for large regions. If you find it slow,
use `ediff-regions-linewise' instead.
STARTUP-HOOKS is a list of functions that Emacs calls without
arguments after setting up the Ediff buffers.
(fn BUFFER-A BUFFER-B &optional STARTUP-HOOKS)
(defalias 'ediff-regions-wordwise #[770 "\211\205 \300!\205 \301\300!!\262\204 \302\303\"\210\211\205* \300!\205* \301\300!!\262\2044 \302\303\"\210\304\305\"\304\306\"\307\211\211\211rq\210\310 \262\311 \262q\210\310 \262\311 \262)\312\300!\300 !
\313\314\307&\n\207" [get-buffer buffer-name user-error "Buffer %S doesn't exist" ediff-clone-buffer-for-region-comparison "-Region.A-" "-Region.B-" nil region-beginning region-end ediff-regions-internal ediff-regions-wordwise word-mode] 20 (#$ . 24349) (byte-code "\300\301\302\303\304!\305#\211\262\301\306\307 \310\311\312\313\314!\315\"\316$\216\317\320!\210)\210\303!\305#D\207" [nil read-buffer "Region's A buffer: " ediff-other-buffer "" t "Region's B buffer: " current-window-configuration make-byte-code 0 "\301\300!\207" vconcat vector [set-window-configuration] 2 other-window 1] 11)])
#@505 Run Ediff on a pair of regions in specified buffers.
BUFFER-A and BUFFER-B are the buffers to be compared.
Regions (i.e., point and mark) can be set in advance or marked interactively.
Each region is enlarged to contain full lines.
This function is effective for large regions, over 100-200
lines. For small regions, use `ediff-regions-wordwise'.
STARTUP-HOOKS is a list of functions that Emacs calls without
arguments after setting up the Ediff buffers.
(fn BUFFER-A BUFFER-B &optional STARTUP-HOOKS)
(defalias 'ediff-regions-linewise #[770 "\211\205 \300!\205 \301\300!!\262\204 \302\303\"\210\211\205* \300!\205* \301\300!!\262\2044 \302\303\"\210\304\305\"\304\306\"\307\211\211\211rq\210\310 \262\311 \262b\210\312 \210`\262b\210\307\210m\204b \307u\210`\262q\210\310 \262\311 \262b\210\312 \210`\262\211b\210\307\210m\204\206 \307u\210`\262)\313\300!\300 !
\314\307\211&\n\207" [get-buffer buffer-name user-error "Buffer %S doesn't exist" ediff-clone-buffer-for-region-comparison "-Region.A-" "-Region.B-" nil region-beginning region-end beginning-of-line ediff-regions-internal ediff-regions-linewise] 20 (#$ . 25683) (byte-code "\300\301\302\303\304!\305#\211\262\301\306\307 \310\311\312\313\314!\315\"\316$\216\317\320!\210)\210\303!\305#D\207" [nil read-buffer "Region A's buffer: " ediff-other-buffer "" t "Region B's buffer: " current-window-configuration make-byte-code 0 "\301\300!\207" vconcat vector [set-window-configuration] 2 other-window 1] 11)])
#@100
(fn BUFFER-A BEG-A END-A BUFFER-B BEG-B END-B STARTUP-HOOKS JOB-NAME WORD-MODE SETUP-PARAMETERS)
(defalias 'ediff-regions-internal #[2570 "\303!\304\211\211C\304C\305\306\307\310\311\"\312\"\313$\216\211\205) \314!\205) \315\314!!\262\203G rq\210\316 \304\223\262\316
\304\223\262
)\202Q \317=\204Q \320\n!\210 \211\205b \314!\205b \315\314!!\262\203\200 r q\210\316 \304\223\262 \316 \n\304\223\262\n)\202\212 \317=\204\212 \320\n!\210\203\235 \321$\210\202\250 \322$\210\323\324\"\240\210\203\303 \321 $\210\202\316 \322 $\210\211\323\325\"\240\210\326#\262\326 #\262\327\242\242\304\211\305\306\330\310\311
\"\331\"\313$B\332\333B\334DB\335BE\"&)\207" [ediff-tmp-buffer this-command ediff-KILLED-VITAL-BUFFER get-buffer-create nil make-byte-code 0 "\300\242;\203 \302\300\242!\203 \303\300\242!\210\301\242;\205# \302\301\242!\205# \303\301\242!\207" vconcat vector [file-exists-p delete-file] 2 get-buffer buffer-name make-marker ediff-quit error ediff-wordify ediff-copy-to-buffer ediff-make-temp-file "regA" "regB" ediff-make-bullet-proof-overlay ediff-setup "\302\300\242!\210\302\301\242!\207" [delete-file] append ediff-word-mode ediff-narrow-bounds ediff-job-name] 29 (#$ . 27203)])
(defalias 'ediff-merge 'ediff-merge-files)
(defalias 'ediff-merge-on-startup #[0 "\300\301!\207" [ediff-do-merge 0] 2])
(put 'ediff-merge-on-startup 'byte-optimizer 'byte-compile-inline-expand)
#@348 Merge two files without ancestor.
FILE-A and FILE-B are the names of the files to be merged.
STARTUP-HOOKS is a list of functions that Emacs calls without
arguments after setting up the Ediff buffers. MERGE-BUFFER-FILE
is the name of the file to be associated with the merge buffer..
(fn FILE-A FILE-B &optional STARTUP-HOOKS MERGE-BUFFER-FILE)
(defalias 'ediff-merge-files #[1026 "\300B\262\301\302!\203 \303\304!\"\202 \305\306&\207" [ediff-merge-on-startup ediff-files-internal file-directory-p expand-file-name file-name-nondirectory nil ediff-merge-files] 11 (#$ . 28702) (byte-code "\203 \202 \n\304\211\305\306\307 \310$\211\262\305\311\203 \202\" \312!\211\262\313\314\315\316\317 !\n\"!\"\210\307\320\"#D\207" [ediff-use-last-dir ediff-last-dir-A default-directory ediff-last-dir-B nil ediff-read-file-name "File A to merge" ediff-get-default-file-name no-dirs "File B to merge" file-name-directory add-to-history file-name-history ediff-abbreviate-file-name expand-file-name file-name-nondirectory 1] 13)])
#@411 Merge two files with ancestor.
FILE-A and FILE-B are the names of the files to be merged, and
FILE-ANCESTOR is the name of the ancestor file. STARTUP-HOOKS is
a list of functions that Emacs calls without arguments after
setting up the Ediff buffers. MERGE-BUFFER-FILE is the name of
the file to be associated with the merge buffer.
(fn FILE-A FILE-B FILE-ANCESTOR &optional STARTUP-HOOKS MERGE-BUFFER-FILE)
(defalias 'ediff-merge-files-with-ancestor #[1283 "\300B\262\301\302!\203 \303\304!\"\202 \305&\207" [ediff-merge-on-startup ediff-files-internal file-directory-p expand-file-name file-name-nondirectory ediff-merge-files-with-ancestor] 12 (#$ . 29757) (byte-code "\203 \202 \n\305\211\211\211\306\307\310 \311$\211\262\306\312\203\" \202% \313!\211\262\314\315\316\317\320\n!\f\"!\"\210\310\321\"#\211\262\306\322\203I \f\202L \313!\211\262\314\315\316\317\320\n!\f\"!\"\210\310\323\"#E\207" [ediff-use-last-dir ediff-last-dir-A default-directory ediff-last-dir-B ediff-last-dir-ancestor nil ediff-read-file-name "File A to merge" ediff-get-default-file-name no-dirs "File B to merge" file-name-directory add-to-history file-name-history ediff-abbreviate-file-name expand-file-name file-name-nondirectory 1 "Ancestor file" 2] 16)])
(defalias 'ediff-merge-with-ancestor 'ediff-merge-files-with-ancestor)
#@622 Merge buffers without ancestor.
BUFFER-A and BUFFER-B are the buffers to be merged.
STARTUP-HOOKS is a list of functions that Emacs calls without
arguments after setting up the Ediff buffers. JOB-NAME is a
symbol describing the Ediff job type; it defaults to
`ediff-merge-buffers', but can also be one of
`ediff-merge-files-with-ancestor', `ediff-last-dir-ancestor',
`ediff-last-dir-C', `ediff-buffers', `ediff-buffers3', or
`ediff-merge-buffers-with-ancestor'. MERGE-BUFFER-FILE is the
name of the file to be associated with the merge buffer.
(fn BUFFER-A BUFFER-B &optional STARTUP-HOOKS JOB-NAME MERGE-BUFFER-FILE)
(defalias 'ediff-merge-buffers #[1282 "\300B\262\204\f \301\262\302\303&\207" [ediff-merge-on-startup ediff-merge-buffers ediff-buffers-internal nil] 12 (#$ . 31117) (byte-code "\300\301\302\303\304!\305#\211\262\301\306\307 \310\311\312\313\314!\315\"\316$\216\317\320!\210)\210\303!\305#D\207" [nil read-buffer "Buffer A to merge: " ediff-other-buffer "" t "Buffer B to merge: " current-window-configuration make-byte-code 0 "\301\300!\207" vconcat vector [set-window-configuration] 2 other-window 1] 11)])
#@675 Merge buffers with ancestor.
BUFFER-A and BUFFER-B are the buffers to be merged, and
BUFFER-ANCESTOR is their ancestor. STARTUP-HOOKS is a list of
functions that Emacs calls without arguments after setting up the
Ediff buffers. JOB-NAME is a symbol describing the Ediff job
type; it defaults to `ediff-merge-buffers-with-ancestor', but can
also be one of `ediff-merge-files-with-ancestor',
`ediff-last-dir-ancestor', `ediff-last-dir-C', `ediff-buffers',
`ediff-buffers3', or `ediff-merge-buffers'. MERGE-BUFFER-FILE is
the name of the file to be associated with the merge buffer.
(fn BUFFER-A BUFFER-B BUFFER-ANCESTOR &optional STARTUP-HOOKS JOB-NAME MERGE-BUFFER-FILE)
(defalias 'ediff-merge-buffers-with-ancestor #[1539 "\300B\262\204\f \301\262\302&\207" [ediff-merge-on-startup ediff-merge-buffers-with-ancestor ediff-buffers-internal] 13 (#$ . 32270) (byte-code "\300\211\301\302\303\304!\305#\211\262\301\306\307 \310\311\312\313\314!\315\"\316$\216\317\320!\210)\210\303!\305#\211\262\301\321\307 \310\311\312\313\314!\322\"\316$\216\317\320!\210)\210\303D!\305#E\207" [nil read-buffer "Buffer A to merge: " ediff-other-buffer "" t "Buffer B to merge: " current-window-configuration make-byte-code 0 "\301\300!\207" vconcat vector [set-window-configuration] 2 other-window 1 "Ancestor buffer: " [set-window-configuration]] 13)])
#@373 Run Ediff by merging two revisions of a file.
The file is the optional FILE argument or the file visited by the
current buffer. STARTUP-HOOKS is a list of functions that Emacs
calls without arguments after setting up the Ediff buffers.
MERGE-BUFFER-FILE is the name of the file to be associated with
the merge buffer.
(fn &optional FILE STARTUP-HOOKS MERGE-BUFFER-FILE)
(defalias 'ediff-merge-revisions #[768 ";\203 \301!\210\302\211\303\304\305;\203 \306!\202 \307\"!\262\303\310\311;\2030 \306!\2021 \307\"!\262\312 \210\313\310\314\"!\302%\207" [ediff-version-control-package find-file nil read-string format-message "Version 1 to merge (default %s's working version): " file-name-nondirectory "current buffer" format "Version 2 to merge (default %s): " ediff-load-version-control intern "ediff-%S-merge-internal"] 11 (#$ . 33643) nil])
#@396 Run Ediff by merging two revisions of a file with a common ancestor.
The file is the optional FILE argument or the file visited by the
current buffer. STARTUP-HOOKS is a list of functions that Emacs
calls without arguments after setting up the Ediff buffers.
MERGE-BUFFER-FILE is the name of the file to be associated with
the merge buffer.
(fn &optional FILE STARTUP-HOOKS MERGE-BUFFER-FILE)
(defalias 'ediff-merge-revisions-with-ancestor #[768 ";\203 \301!\210\302\211\211\303\304\305;\203 \306 !\202 \307\"!\262\303\310\311;\2031 \306 !\2022 \307\"!\262\303\304\312;\203F \306 !\202G \307\"!\262\313 \210\314\310\315\"!%\207" [ediff-version-control-package find-file nil read-string format-message "Version 1 to merge (default %s's working version): " file-name-nondirectory "current buffer" format "Version 2 to merge (default %s): " "Ancestor version (default %s's base revision): " ediff-load-version-control intern "ediff-%S-merge-internal"] 12 (#$ . 34514) nil])
#@302 Query for a file name, and then run Ediff by patching that file.
If optional PATCH-BUF is given, use the patch in that buffer
and don't ask the user.
If prefix argument ARG, then: if even argument, assume that the
patch is in a buffer. If odd -- assume it is in a file.
(fn &optional ARG PATCH-BUF)
(defalias 'ediff-patch-file #[512 "\304\211\305\306!\210\307\205 \310!\205 \311!\"\262\203 \2025 \n\2044 \312!\2034 \313\314\312!!!\2025 \262\315\316\304\211\317 %\262\320\"\207" [ediff-use-last-dir ediff-last-dir-patch ediff-patch-default-directory default-directory nil require ediff-ptch ediff-get-patch-buffer prefix-numeric-value get-buffer buffer-file-name file-name-directory expand-file-name read-file-name "File to patch (directory, if multifile patch): " ediff-get-default-file-name ediff-dispatch-file-patching-job] 10 (#$ . 35519) "P"])
#@516 Run Ediff by patching the buffer specified at prompt.
Without the optional prefix ARG, asks if the patch is in some buffer and
prompts for the buffer or a file, depending on the answer.
With ARG=1, assumes the patch is in a file and prompts for the file.
With ARG=2, assumes the patch is in a buffer and prompts for the buffer.
PATCH-BUF is an optional argument, which specifies the buffer that contains the
patch. If not given, the user is prompted according to the prefix argument.
(fn &optional ARG PATCH-BUF)
(defalias 'ediff-patch-buffer #[512 "\300\301!\210\302\205\f \303!\"\262\304\305\306\307!\310#\"\207" [require ediff-ptch ediff-get-patch-buffer prefix-numeric-value ediff-patch-buffer-internal read-buffer "Which buffer to patch? " ediff-other-buffer require-match] 8 (#$ . 36394) "P"])
(byte-code "\300\301\302\"\210\300\303\304\"\207" [defalias epatch ediff-patch-file epatch-buffer ediff-patch-buffer] 3)
#@380 Run Ediff by comparing versions of a file.
The file is an optional FILE argument or the file entered at the prompt.
Default: the file visited by the current buffer.
Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'.
STARTUP-HOOKS is a list of functions that Emacs calls without
arguments after setting up the Ediff buffers.
(fn &optional FILE STARTUP-HOOKS)
(defalias 'ediff-revision #[512 ";\204 \304\305\203 \202 \n\306 \307$\262\310!\210\311 \203- \312\313\314\315 \"!\203- \316p!\210\317\211\320\313\321\322!\"!\262\320\313\323\322!\"!\262\324 \210\325\313\326 \"!#\207" [ediff-use-last-dir ediff-last-dir-A default-directory ediff-version-control-package ediff-read-file-name "Compare revisions for file" ediff-get-default-file-name no-dirs find-file buffer-modified-p y-or-n-p format "Buffer %s is modified. Save buffer? " buffer-name save-buffer nil read-string "Revision 1 to compare (default %s's latest revision): " file-name-nondirectory "Revision 2 to compare (default %s's current state): " ediff-load-version-control intern "ediff-%S-internal"] 9 (#$ . 37330) "P"])
(defalias 'erevision 'ediff-revision)
#@25
(fn &optional SILENT)
(defalias 'ediff-load-version-control #[256 "\301\302!\210\303!\206\" \304\305!!\203 \306\307!\210\301!\207\211\206\" \310\311\"\207" [ediff-version-control-package require ediff-vers featurep locate-library symbol-name message "" user-error "Version control package %S.el not found. Use vc.el instead"] 4 (#$ . 38493)])
#@97 Return string describing the version of Ediff.
When called interactively, displays the version.
(defalias 'ediff-version #[0 "\301\302!\203\f \303\304\300 \"\207\305\306\"\207" [ediff-version called-interactively-p interactive message "%s" format "Ediff %s"] 3 (#$ . 38850) nil])
#@85 Display Ediff's manual.
With optional NODE, goes to that node.
(fn &optional NODE)
(defalias 'ediff-documentation #[256 " \306 \210\3071( \310\311\312!!\210\313\314!\210\203 \315!\210\202\" \316\317!\210\320 0\202\231 \210\321\322!\210\nr\311 !q\210p\323 \210\324\211\325\211#\325 $ %\326 \210\327\330!\210+\211 &\211\211\205b \331!\205b \332\331!!\262\203s r&q\210\333 \210)\202 '\334=\204 \335(!\210\336)!\210\337!\210)\266\340!\205\231 \341!\210\342\"\207" [ediff-control-window ediff-control-buffer default-directory ediff-msg-buffer buffer-read-only buffer-file-name ediff-skip-unsuitable-frames (error) pop-to-buffer get-buffer-create "*info*" info "ediff" Info-goto-node message "Type `i' to search for a specific topic" raise-frame beep 1 kill-all-local-variables nil t erase-buffer run-hooks temp-buffer-setup-hook get-buffer buffer-name fundamental-mode ediff-quit error princ internal-temp-output-buffer-show window-live-p select-window set-window-buffer buffer-undo-list inhibit-modification-hooks inhibit-read-only standard-output this-command ediff-KILLED-VITAL-BUFFER ediff-BAD-INFO] 10 (#$ . 39137) nil])
#@62 Call `ediff-files' with the next two command line arguments.
(defalias 'ediff-files-command #[0 "@A@AA\301\"\207" [command-line-args-left ediff] 5 (#$ . 40289)])
#@65 Call `ediff3-files' with the next three command line arguments.
(defalias 'ediff3-files-command #[0 "@A@\3018\302\233\303#\207" [command-line-args-left 2 3 ediff3] 7 (#$ . 40463)])
#@68 Call `ediff-merge-files' with the next two command line arguments.
(defalias 'ediff-merge-command #[0 "@A@AA\301\"\207" [command-line-args-left ediff-merge-files] 5 (#$ . 40658)])
#@84 Call `ediff-merge-files-with-ancestor' with the next three command line arguments.
(defalias 'ediff-merge-with-ancestor-command #[0 "@A@\3018\302\233\303#\207" [command-line-args-left 2 3 ediff-merge-files-with-ancestor] 7 (#$ . 40850)])
#@70 Call `ediff-directories' with the next three command line arguments.
(defalias 'ediff-directories-command #[0 "@A@\3018\302\233\303#\207" [command-line-args-left 2 3 ediff-directories] 7 (#$ . 41102)])
#@70 Call `ediff-directories3' with the next four command line arguments.
(defalias 'ediff-directories3-command #[0 "@A@\3018\3028\303\233\304$\207" [command-line-args-left 2 3 4 ediff-directories3] 9 (#$ . 41318)])
#@76 Call `ediff-merge-directories' with the next three command line arguments.
(defalias 'ediff-merge-directories-command #[0 "@A@\3018\302\233\303#\207" [command-line-args-left 2 3 ediff-merge-directories] 7 (#$ . 41545)])
#@89 Call `ediff-merge-directories-with-ancestor' with the next four command line arguments.
(defalias 'ediff-merge-directories-with-ancestor-command #[0 "@A@\3018\3028\303\233\304$\207" [command-line-args-left 2 3 4 ediff-merge-directories-with-ancestor] 9 (#$ . 41779)])
(byte-code "\300\301!\210\302\303!\207" [run-hooks ediff-load-hook provide ediff] 2)
Mini Shell