HOME

Mini Shell 1.0
DIR:/proc/self/root/usr/share/emacs/26.1/lisp/vc/
Current File : //proc/self/root/usr/share/emacs/26.1/lisp/vc/ediff.elc
;ELC
;;; Compiled
;;; in Emacs version 26.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.

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;


#@30 The current version of Ediff
(defconst ediff-version "2.81.5" (#$ . 408))
#@21 Date of last update
(defconst ediff-date "July 4, 2013" (#$ . 488))
(byte-code "\300\301!\210\302\303!\204\304\303\305\306B\"\210\307\310!\210\307\311!\210\307\312!\210\313\301\314\315\316\317\320\321&\210\322\323\314\324\325\326\320\301&\207" [provide ediff fboundp declare-function defalias macro #[(&rest _r) "\300\207" [nil] 1] require ediff-util ediff-init ediff-mult custom-declare-group nil "Comprehensive visual interface to `diff' and `patch'." :tag "Ediff" :group tools custom-declare-variable ediff-use-last-dir "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 #[nil "\211\205\305	!\205\306\305	!!)\203rq\210\307\211)\207\310=\206'\311\f!\207" [ediff-buffer-A buf buffer-read-only this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name t ediff-quit error] 4])
(defalias 'ediff-get-default-file-name #[(&optional default fileno) "\306=\203S\307\310\311\"\3121\313\314!0\202\210\310\310\211\211\250\204(\315;\2033B
;\203B\316
!\204B
B\f\244\211\234\211\206Q-\207;\203\\\207\317p!\205g\320\317p!!\207" [major-mode result choices aux-list marked current 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 fileno default] 6])
#@158 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.
(defalias 'ediff-files #[(file-A file-B &optional startup-hooks) "\303\304	!\203\305\306!	\"\202	\307\n\310%\207" [file-A file-B startup-hooks ediff-files-internal file-directory-p expand-file-name file-name-nondirectory nil ediff-files] 6 (#$ . 2037) (let ((dir-A (if ediff-use-last-dir ediff-last-dir-A default-directory)) dir-B f) (list (setq f (ediff-read-file-name "File A to compare" dir-A (ediff-get-default-file-name) 'no-dirs)) (ediff-read-file-name "File B to compare" (setq dir-B (if ediff-use-last-dir ediff-last-dir-B (file-name-directory f))) (progn (ediff-add-to-history 'file-name-history (ediff-abbreviate-file-name (expand-file-name (file-name-nondirectory f) dir-B))) (ediff-get-default-file-name f 1)))))])
#@163 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.
(defalias 'ediff-files3 #[(file-A file-B file-C &optional startup-hooks) "\304\305	!\203\306\307!	\"\202	\305\n!\203!\306\307!\n\"\202\"\n\310%\207" [file-A file-B file-C startup-hooks ediff-files-internal file-directory-p expand-file-name file-name-nondirectory ediff-files3] 6 (#$ . 2934) (let ((dir-A (if ediff-use-last-dir ediff-last-dir-A default-directory)) dir-B dir-C f ff) (list (setq f (ediff-read-file-name "File A to compare" dir-A (ediff-get-default-file-name) 'no-dirs)) (setq ff (ediff-read-file-name "File B to compare" (setq dir-B (if ediff-use-last-dir ediff-last-dir-B (file-name-directory f))) (progn (ediff-add-to-history 'file-name-history (ediff-abbreviate-file-name (expand-file-name (file-name-nondirectory f) dir-B))) (ediff-get-default-file-name f 1)))) (ediff-read-file-name "File C to compare" (setq dir-C (if ediff-use-last-dir ediff-last-dir-C (file-name-directory ff))) (progn (ediff-add-to-history 'file-name-history (ediff-abbreviate-file-name (expand-file-name (file-name-nondirectory ff) dir-C))) (ediff-get-default-file-name ff 2)))))])
(defalias 'ediff3 'ediff-files3)
#@511 Visit FILE and arrange its buffer to Ediff's liking.
FILE-VAR is actually a variable symbol whose value must contain a true
file name.
BUFFER-NAME is a variable symbol, which will get the buffer object into
which FILE is read.
LAST-DIR is the directory variable symbol where FILE's
directory name should be returned.  HOOKS-VAR is a variable symbol that will
be assigned the hook to be executed after `ediff-startup' is finished.
`ediff-find-file' arranges that the temp files it might create will be
deleted.
(defalias 'ediff-find-file #[(file-var buffer-name &optional last-dir hooks-var) "J\306	!\307	!\310	!\204\311\312	\"\210\202$\313	!\203$\311\314	\"\210\315	!\f\2034\f\315\316	!!L\210
\317	!L\210
J\211\205O\320!\205O\305\320!!)\203\240r
Jq\210~\210\n\203x\321\322!\210\323p\"\324\325\326	DEJBL\210\202\234\327	!\327\330 !\232\204\231\323p\"\324\325\326	DEJBL\210\202\234\321 \210)\202\254\331=\204\254\332!\210	L+\207" [file-var file file-magic temp-file-name-prefix last-dir buffer-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 get-buffer ediff-verify-file-buffer magic ediff-make-temp-file lambda nil delete-file file-truename buffer-file-name ediff-quit error buf hooks-var this-command ediff-KILLED-VITAL-BUFFER] 6 (#$ . 4220)])
(defalias 'ediff-files-internal #[(file-A file-B file-C startup-hooks job-name &optional merge-buffer-file) "\306\211\211\f\230\203\307\310!\210
;\203+
\230\203!\307\311!\204+\f
\230\203+\307\312!\210\313\314\"\210\315\303\302\316\317$\210\313\314\f\"\210\315\304\301\320\317$\210
;\203_\313\314
\"\210\315\305\300\321=\203[\322\202\\\323\317$\210\324\n	\f
\325BC&	+\207" [buf-C buf-B buf-A file-A file-B file-C nil error "Files A and B are the same" "Files A and C are the same" "Files B and C are the same" message "Reading file %s ... " ediff-find-file ediff-last-dir-A startup-hooks ediff-last-dir-B ediff-merge-files-with-ancestor ediff-last-dir-ancestor ediff-last-dir-C ediff-setup ediff-job-name job-name merge-buffer-file] 10])
(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 #[nil "\306=\203	\307=\203\n\203\310 \204\311p!\203\312\313!\210\314 \2051\2051\315!\2051\316\317!\211\203:\202;
\320P\321!\204V\312\322!\210\203c\323!\210\324\325!rq\210\326!\210 \210)\327p\"-\207" [revert-buffer-function revert-buffer-insert-file-contents-function buffer-file-number buffer-auto-save-file-name auto-save-p buffer-file-name 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 file-name revert-buf-name revert-buf major-mode current-major] 4 (#$ . 6482) nil])
#@160 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.
(defalias 'ediff-backup #[(file) "\303\304!\210\305\211\306\n!\203\n\307\n!\202$\310\n!\206!\311\312\n\"\n\313	\"*\207" [ori bak file require diff nil backup-file-name-p file-name-sans-versions diff-latest-backup-file error "No backup found for %s" ediff-files] 3 (#$ . 7570) (list (read-file-name "Ediff (file with backup): "))])
#@435 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'.
(defalias 'ediff-buffers #[(buffer-A buffer-B &optional startup-hooks job-name) "\204\304\305	\n\306%\207" [job-name buffer-A buffer-B startup-hooks ediff-buffers ediff-buffers-internal nil] 6 (#$ . 8078) (let (bf) (list (setq bf (read-buffer "Buffer A to compare: " (ediff-other-buffer "") t)) (read-buffer "Buffer B to compare: " (progn (let ((#1=#:wconfig (current-window-configuration))) (unwind-protect (progn (other-window 1)) (set-window-configuration #1#))) (ediff-other-buffer bf)) t)))])
(defalias 'ebuffers 'ediff-buffers)
#@442 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'.
(defalias 'ediff-buffers3 #[(buffer-A buffer-B buffer-C &optional startup-hooks job-name) "\204\305\306	\n\f%\207" [job-name buffer-A buffer-B buffer-C startup-hooks ediff-buffers3 ediff-buffers-internal] 6 (#$ . 9059) (let (bf bff) (list (setq bf (read-buffer "Buffer A to compare: " (ediff-other-buffer "") t)) (setq bff (read-buffer "Buffer B to compare: " (progn (let ((#1=#:wconfig . #3=((current-window-configuration)))) (unwind-protect (progn (other-window 1)) (set-window-configuration #1#))) (ediff-other-buffer bf)) t)) (read-buffer "Buffer C to compare: " (progn (let ((#2=#:wconfig . #3#)) (unwind-protect (progn (other-window 1)) (set-window-configuration #2#))) (ediff-other-buffer (list bf bff))) t)))])
(defalias 'ebuffers3 'ediff-buffers3)
(defalias 'ediff-buffers-internal #[(buf-A buf-B buf-C startup-hooks job-name &optional merge-buffer-file) "\306\307!!\306\307\n!!\f\211\205\307
!\205\310\307
!!)\211\205)\306\307\n!!\311\211\311\312\216\211\205G\307
!\205G\310\307
!!)\204P\313\314\"\210\n\211\205a\307
!\205a\310\307
!!)\204j\313\314\n\"\210\203}\204}\313\314\f\"\210)	;\203\207\315	!;\203\220\315!;\203\234\315!\316	\"\316\n\"\203\264\316\f\"\317\307!\307\n!\205\307\307\f!\320\311\321D\321D\322\323D\321DE\257B\324BC&	.\207" [buf-A buf-A-file-name buf-B buf-B-file-name buf-C buf buffer-file-name get-buffer buffer-name nil #[nil ";\203\303!\203\304!\210	;\203\303	!\203\304	!\210\n;\205,\303\n!\205,\304\n!\207" [file-A file-B file-C file-exists-p delete-file] 2] user-error "Buffer %S doesn't exist" file-name-nondirectory ediff-make-temp-file ediff-setup lambda delete-file if stringp ediff-job-name buf-C-is-alive buf-C-file-name file-A file-B file-C job-name ediff-3way-comparison-job startup-hooks merge-buffer-file] 16])
(defalias 'ediff-get-default-directory-name #[nil "\203	\207\n\305=\203#\306\307\310\"\211;\203 \311!\203 \202!\f)\207\f\207" [ediff-use-last-dir ediff-last-dir-A major-mode f default-directory dired-mode dired-get-filename nil noerror file-directory-p] 4])
#@216 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.
(defalias 'ediff-directories #[(dir1 dir2 regexp) "\303	\304\n\305\306&\207" [dir1 dir2 regexp ediff-directories-internal nil ediff-files ediff-directories] 7 (#$ . 11640) (let ((dir-A (ediff-get-default-directory-name)) (default-regexp (eval ediff-default-filtering-regexp)) f) (list (setq f (read-directory-name "Directory A to compare: " dir-A nil 'must-match)) (read-directory-name "Directory B to compare: " (if ediff-use-last-dir ediff-last-dir-B (ediff-strip-last-dir f)) nil 'must-match) (read-string (if (stringp default-regexp) (format "Filter filenames through regular expression (default %s): " default-regexp) "Filter filenames through regular expression: ") nil 'ediff-filtering-regexp-history (eval ediff-default-filtering-regexp))))])
(defalias 'edirs 'ediff-directories)
#@229 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.
(defalias 'ediff-directory-revisions #[(dir1 regexp) "\302	\303\304$\207" [dir1 regexp ediff-directory-revisions-internal ediff-revision ediff-directory-revisions] 5 (#$ . 12652) (let ((dir-A (ediff-get-default-directory-name)) (default-regexp (eval ediff-default-filtering-regexp))) (list (read-directory-name "Directory to compare with revision:" dir-A nil 'must-match) (read-string (if (stringp default-regexp) (format "Filter filenames through regular expression (default %s): " default-regexp) "Filter filenames through regular expression: ") nil 'ediff-filtering-regexp-history (eval ediff-default-filtering-regexp))))])
(defalias 'edir-revisions 'ediff-directory-revisions)
#@223 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.
(defalias 'ediff-directories3 #[(dir1 dir2 dir3 regexp) "\304	\n\305\306&\207" [dir1 dir2 dir3 regexp ediff-directories-internal ediff-files3 ediff-directories3] 7 (#$ . 13569) (let ((dir-A (ediff-get-default-directory-name)) (default-regexp (eval ediff-default-filtering-regexp)) f) (list (setq f (read-directory-name "Directory A to compare:" dir-A nil)) (setq f (read-directory-name "Directory B to compare:" (if ediff-use-last-dir ediff-last-dir-B (ediff-strip-last-dir f)) nil 'must-match)) (read-directory-name "Directory C to compare:" (if ediff-use-last-dir ediff-last-dir-C (ediff-strip-last-dir f)) nil 'must-match) (read-string (if (stringp default-regexp) (format "Filter filenames through regular expression (default %s): " default-regexp) "Filter filenames through regular expression: ") nil 'ediff-filtering-regexp-history (eval ediff-default-filtering-regexp))))])
(defalias 'edirs3 'ediff-directories3)
#@283 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.
(defalias 'ediff-merge-directories #[(dir1 dir2 regexp &optional merge-autostore-dir) "\304	\305\n\306\307\305&\207" [dir1 dir2 regexp merge-autostore-dir ediff-directories-internal nil ediff-merge-files ediff-merge-directories] 9 (#$ . 14721) (let ((dir-A (ediff-get-default-directory-name)) (default-regexp (eval ediff-default-filtering-regexp)) f) (list (setq f (read-directory-name "Directory A to merge:" dir-A nil 'must-match)) (read-directory-name "Directory B to merge:" (if ediff-use-last-dir ediff-last-dir-B (ediff-strip-last-dir f)) nil 'must-match) (read-string (if (stringp default-regexp) (format "Filter filenames through regular expression (default %s): " default-regexp) "Filter filenames through regular expression: ") nil 'ediff-filtering-regexp-history (eval ediff-default-filtering-regexp))))])
(defalias 'edirs-merge 'ediff-merge-directories)
#@443 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.
(defalias 'ediff-merge-directories-with-ancestor #[(dir1 dir2 ancestor-dir regexp &optional merge-autostore-dir) "\305	\n\306\307\310\f&\207" [dir1 dir2 ancestor-dir regexp merge-autostore-dir ediff-directories-internal ediff-merge-files-with-ancestor ediff-merge-directories-with-ancestor nil] 9 (#$ . 15879) (let ((dir-A (ediff-get-default-directory-name)) (default-regexp (eval ediff-default-filtering-regexp)) f) (list (setq f (read-directory-name "Directory A to merge:" dir-A nil)) (setq f (read-directory-name "Directory B to merge:" (if ediff-use-last-dir ediff-last-dir-B (ediff-strip-last-dir f)) nil 'must-match)) (read-directory-name "Ancestor directory:" (if ediff-use-last-dir ediff-last-dir-C (ediff-strip-last-dir f)) nil 'must-match) (read-string (if (stringp default-regexp) (format "Filter filenames through regular expression (default %s): " default-regexp) "Filter filenames through regular expression: ") nil 'ediff-filtering-regexp-history (eval ediff-default-filtering-regexp))))])
#@296 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.
(defalias 'ediff-merge-directory-revisions #[(dir1 regexp &optional merge-autostore-dir) "\303	\304\305\306\n&\207" [dir1 regexp merge-autostore-dir ediff-directory-revisions-internal ediff-merge-revisions ediff-merge-directory-revisions nil] 7 (#$ . 17337) (let ((dir-A (ediff-get-default-directory-name)) (default-regexp (eval ediff-default-filtering-regexp))) (list (read-directory-name "Directory to merge with revisions:" dir-A nil 'must-match) (read-string (if (stringp default-regexp) (format "Filter filenames through regular expression (default %s): " default-regexp) "Filter filenames through regular expression: ") nil 'ediff-filtering-regexp-history (eval ediff-default-filtering-regexp))))])
(defalias 'edir-merge-revisions 'ediff-merge-directory-revisions)
#@310 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.
(defalias 'ediff-merge-directory-revisions-with-ancestor #[(dir1 regexp &optional merge-autostore-dir) "\303	\304\305\306\n&\207" [dir1 regexp merge-autostore-dir ediff-directory-revisions-internal ediff-merge-revisions-with-ancestor ediff-merge-directory-revisions-with-ancestor nil] 7 (#$ . 18412) (let ((dir-A (ediff-get-default-directory-name)) (default-regexp (eval ediff-default-filtering-regexp))) (list (read-directory-name "Directory to merge with revisions and ancestors:" dir-A nil 'must-match) (read-string (if (stringp default-regexp) (format "Filter filenames through regular expression (default %s): " default-regexp) "Filter filenames through regular expression: ") nil 'ediff-filtering-regexp-history (eval ediff-default-filtering-regexp))))])
(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)
(defalias 'ediff-directories-internal #[(dir1 dir2 dir3 regexp action jobname &optional startup-hooks merge-autostore-dir) ";\203\306!\203\202\307!	\n\230\203!\310\311	\"\210\202F\312=\2035	\230\2035\310\313	\"\210\202F\312=\203F\n\230\203F\310\314	\"\210\f\203T\f;\204T\315\316\"\210\317\211&'\203\204\211(\206g)\320>)\203\204\f\204\204\321\322*\203}+\202\200\323	!\317\324$\f\203\315	;\203\240\f	\230\203\240\325\326!\204\315\310\327!\210\202\315\n;\203\270\f\n\230\203\270\325\330!\204\315\310\327!\210\202\315;\203\315\f\230\203\315\325\331!\204\315\310\327!\210\332,	\n\f&&\333\317\334\335\336-DE\334\337\340\336&DDEF.B.\341\342&@\343\344.&\345
!*\207" [dir3 dir1 dir2 jobname merge-autostore-dir meta-buf 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 lambda setq ediff-session-action-function quote ediff-dir-difference-list cdr ediff-prepare-meta-buffer ediff-filegroup-action "*Ediff Session Group Panel" ediff-redraw-directory-group-buffer ediff-show-meta-buffer dir-diff-struct ediff-autostore-merges metajob ediff-metajob-name ediff-use-last-dir ediff-last-merge-autostore-dir regexp action startup-hooks] 9])
(defalias 'ediff-directory-revisions-internal #[(dir1 regexp action jobname &optional startup-hooks merge-autostore-dir) "\306!\203\n\202
\307!	\203	;\204\310\311\n\"\210\312\211
\203J\n\211\206-\313>)\203J	\204J\314\315 \203C!\202F\316!\312\317$	\203c;\203c	\230\203c\320\321!\204c\322\323!\210\324\n\"	$\325\312\326\327\330#DEE$B$\331\332\f\333\334\n$&\335!*\207" [dir1 merge-autostore-dir jobname meta-buf file-list ediff-autostore-merges 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 lambda setq ediff-session-action-function quote ediff-prepare-meta-buffer ediff-filegroup-action "*Ediff Session Group Panel" ediff-redraw-directory-group-buffer ediff-show-meta-buffer metajob ediff-metajob-name ediff-use-last-dir ediff-last-merge-autostore-dir regexp action startup-hooks] 8])
#@344 Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
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.
(defalias 'ediff-windows-wordwise #[(dumb-mode &optional wind-A wind-B startup-hooks) "\304	\n\305\306&\207" [dumb-mode wind-A wind-B startup-hooks ediff-windows ediff-windows-wordwise word-mode] 7 (#$ . 22916) "P"])
#@344 Compare WIND-A and WIND-B, which are selected by clicking, linewise.
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.
(defalias 'ediff-windows-linewise #[(dumb-mode &optional wind-A wind-B startup-hooks) "\304	\n\305\306&\207" [dumb-mode wind-A wind-B startup-hooks ediff-windows ediff-windows-linewise nil] 7 (#$ . 23486) "P"])
(defalias 'ediff-windows #[(dumb-mode wind-A wind-B startup-hooks job-name word-mode) "\204	\306 \204D	\307\310!\203\202#\n\203!\311!\202#\312 *\f	\310!\2033\202?\n\203=\311!\202?\312 *\202P\313	\307\314#\313\f	\315#\316	!\316\f!\307\211\211\211\212\317 \320\216\321\322!\210\323	!\210\324 \325 \323\f!\210\324 \325 +\326	\327#\326\f\330#\331
 !\"\307&\n.\207" [dumb-mode wind-A prev-wind wind wind-B end-B ediff-window-display-p nil window-live-p next-window selected-window ediff-get-window-by-clicking 1 2 window-buffer current-window-configuration #[nil "\301!\207" [#1=#:wconfig set-window-configuration] 2] sit-for 0 select-window window-start window-end ediff-clone-buffer-for-window-comparison "-Window.A-" "-Window.B-" ediff-regions-internal beg-B end-A beg-A buffer-B buffer-A #1# startup-hooks job-name word-mode] 11])
#@423 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 is effective only for relatively small regions, up to 200
lines.  For large regions, use `ediff-regions-linewise'.
STARTUP-HOOKS is a list of functions that Emacs calls without
arguments after setting up the Ediff buffers.
(defalias 'ediff-regions-wordwise #[(buffer-A buffer-B &optional startup-hooks) "\211\205\306	!\205\307\306	!!)\204\310\311\"\210\n\211\205+\306	!\205+\307\306	!!)\2044\310\311\n\"\210\312\313\"\312\n\314\"\315\211\211\211rq\210\316 \317 \nq\210\316 \317 )\320\306!
\306\n!\f\321\322\315&\n.\207" [buffer-A buf buffer-B reg-B-end reg-B-beg reg-A-end 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 reg-A-beg startup-hooks] 12 (#$ . 24950) (let (bf) (list (setq bf (read-buffer "Region's A buffer: " (ediff-other-buffer "") t)) (read-buffer "Region's B buffer: " (progn (let ((#1=#:wconfig (current-window-configuration))) (unwind-protect (progn (other-window 1)) (set-window-configuration #1#))) (ediff-other-buffer bf)) t)))])
#@457 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.
(defalias 'ediff-regions-linewise #[(buffer-A buffer-B &optional startup-hooks) "\211\205\306	!\205\307\306	!!)\204\310\311\"\210\n\211\205+\306	!\205+\307\306	!!)\2044\310\311\n\"\210\312\313\"\312\n\314\"\315\211\211\211rq\210\316 \317 b\210\320 \210`
b\210\315\210m\204i\315u\210`\nq\210\316 \317 \fb\210\320 \210`b\210\315\210m\204\211\315u\210`)\321\306!
\306\n!\f\322\315\211&\n.\207" [buffer-A buf buffer-B reg-B-end reg-B-beg reg-A-end 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 reg-A-beg startup-hooks] 12 (#$ . 26308) (let (bf) (list (setq bf (read-buffer "Region A's buffer: " (ediff-other-buffer "") t)) (read-buffer "Region B's buffer: " (progn (let ((#1=#:wconfig (current-window-configuration))) (unwind-protect (progn (other-window 1)) (set-window-configuration #1#))) (ediff-other-buffer bf)) t)))])
(defalias 'ediff-regions-internal #[(buffer-A beg-A end-A buffer-B beg-B end-B startup-hooks job-name word-mode setup-parameters) "\306!\307\211\211\211\310\216\211\205#\311!\205#\312\311!!)\203@rq\210\313 \307\223\313 \307\223)\202L\314=\204L\315 !\210!\211\205a\311!\205a\312\311!!)\203~r!q\210\313 \"\307\223\"\313 #\307\223#)\202\212\314=\204\212\315 !\210$\203\234\316
$\210\202\246\317
$\210\320
\321\"$\203\275\316\"#!
$\210\202\307\317\"#!
$\210\320
\322\"\323#\323\"#!#\324\n!	\307\211\325\307\326\nD\326	DF%B\327\330$B\331\fDB\332&BE'\"&.\207" [ediff-tmp-buffer file-B file-A overl-B overl-A tmp-buffer get-buffer-create nil #[nil ";\203\302!\203\303!\210	;\205\302	!\205\303	!\207" [file-A file-B 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 lambda delete-file append ediff-word-mode ediff-narrow-bounds ediff-job-name buffer-A buf beg-A end-A this-command ediff-KILLED-VITAL-BUFFER buffer-B beg-B end-B word-mode startup-hooks job-name setup-parameters] 14])
(defalias 'ediff-merge 'ediff-merge-files)
(defalias 'ediff-merge-on-startup #[nil "\300\301!\207" [ediff-do-merge 0] 2])
(put 'ediff-merge-on-startup 'byte-optimizer 'byte-compile-inline-expand)
#@286 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..
(defalias 'ediff-merge-files #[(file-A file-B &optional startup-hooks merge-buffer-file) "\304B\305	\306\n!\203\307\310	!\n\"\202\n\311\312&\207" [startup-hooks file-A file-B merge-buffer-file ediff-merge-on-startup ediff-files-internal file-directory-p expand-file-name file-name-nondirectory nil ediff-merge-files] 7 (#$ . 29242) (let ((dir-A (if ediff-use-last-dir ediff-last-dir-A default-directory)) dir-B f) (list (setq f (ediff-read-file-name "File A to merge" dir-A (ediff-get-default-file-name) 'no-dirs)) (ediff-read-file-name "File B to merge" (setq dir-B (if ediff-use-last-dir ediff-last-dir-B (file-name-directory f))) (progn (ediff-add-to-history 'file-name-history (ediff-abbreviate-file-name (expand-file-name (file-name-nondirectory f) dir-B))) (ediff-get-default-file-name f 1)))))])
#@335 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.
(defalias 'ediff-merge-files-with-ancestor #[(file-A file-B file-ancestor &optional startup-hooks merge-buffer-file) "\305B\306	\307\n!\203\310\311	!\n\"\202\n\312\f&\207" [startup-hooks file-A file-B file-ancestor merge-buffer-file ediff-merge-on-startup ediff-files-internal file-directory-p expand-file-name file-name-nondirectory ediff-merge-files-with-ancestor] 7 (#$ . 30346) (let ((dir-A (if ediff-use-last-dir ediff-last-dir-A default-directory)) dir-B dir-ancestor f ff) (list (setq f (ediff-read-file-name "File A to merge" dir-A (ediff-get-default-file-name) 'no-dirs)) (setq ff (ediff-read-file-name "File B to merge" (setq dir-B (if ediff-use-last-dir ediff-last-dir-B (file-name-directory f))) (progn (ediff-add-to-history 'file-name-history (ediff-abbreviate-file-name (expand-file-name (file-name-nondirectory f) dir-B))) (ediff-get-default-file-name f 1)))) (ediff-read-file-name "Ancestor file" (setq dir-ancestor (if ediff-use-last-dir ediff-last-dir-ancestor (file-name-directory ff))) (progn (ediff-add-to-history 'file-name-history (ediff-abbreviate-file-name (expand-file-name (file-name-nondirectory ff) dir-ancestor))) (ediff-get-default-file-name ff 2)))))])
(defalias 'ediff-merge-with-ancestor 'ediff-merge-files-with-ancestor)
#@547 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.
(defalias 'ediff-merge-buffers #[(buffer-A buffer-B &optional startup-hooks job-name merge-buffer-file) "\305B	\204\n\306\307\n\310	\f&\207" [startup-hooks job-name buffer-A buffer-B merge-buffer-file ediff-merge-on-startup ediff-merge-buffers ediff-buffers-internal nil] 7 (#$ . 31952) (let (bf) (list (setq bf (read-buffer "Buffer A to merge: " (ediff-other-buffer "") t)) (read-buffer "Buffer B to merge: " (progn (let ((#1=#:wconfig (current-window-configuration))) (unwind-protect (progn (other-window 1)) (set-window-configuration #1#))) (ediff-other-buffer bf)) t)))])
#@584 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.
(defalias 'ediff-merge-buffers-with-ancestor #[(buffer-A buffer-B buffer-ancestor &optional startup-hooks job-name merge-buffer-file) "\306B	\204\n\307\310\n\f	
&\207" [startup-hooks job-name buffer-A buffer-B buffer-ancestor merge-buffer-file ediff-merge-on-startup ediff-merge-buffers-with-ancestor ediff-buffers-internal] 7 (#$ . 33088) (let (bf bff) (list (setq bf (read-buffer "Buffer A to merge: " (ediff-other-buffer "") t)) (setq bff (read-buffer "Buffer B to merge: " (progn (let ((#1=#:wconfig . #3=((current-window-configuration)))) (unwind-protect (progn (other-window 1)) (set-window-configuration #1#))) (ediff-other-buffer bf)) t)) (read-buffer "Ancestor buffer: " (progn (let ((#2=#:wconfig . #3#)) (unwind-protect (progn (other-window 1)) (set-window-configuration #2#))) (ediff-other-buffer (list bf bff))) t)))])
#@320 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.
(defalias 'ediff-merge-revisions #[(&optional file startup-hooks merge-buffer-file) ";\203	\306!\210\307\211\310\311\312;\203\313!\202\314\"!\310\315\316;\203-\313!\202.\314\"!\317 \210\320\315\321\"!\n	\307\f
%*\207" [file rev2 rev1 ediff-version-control-package startup-hooks merge-buffer-file 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"] 6 (#$ . 34517) nil])
#@343 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.
(defalias 'ediff-merge-revisions-with-ancestor #[(&optional file startup-hooks merge-buffer-file) ";\203	\306!\210\307\211\211\310\311\312;\203\313!\202\314\"!\310\315\316;\203/\313!\2020\314\"!\310\311\317;\203A\313!\202B\314\"!\320 \210\321\315\322\f\"!\n	
%+\207" [file ancestor-rev rev2 rev1 ediff-version-control-package startup-hooks 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" merge-buffer-file] 6 (#$ . 35417) nil])
#@272 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.
(defalias 'ediff-patch-file #[(&optional arg patch-buf) "\306\211\307\310!\210\311\n\205\312\n!\205\313!\"\f\203!
\2028\2046\314!\2036\315\316\314!!!\2028\317\320	\306\211\321 %\322\"*\207" [source-file source-dir arg patch-buf ediff-use-last-dir ediff-last-dir-patch 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 ediff-patch-default-directory default-directory] 6 (#$ . 36460) "P"])
#@486 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.
(defalias 'ediff-patch-buffer #[(&optional arg patch-buf) "\302\303!\210\304\205\f\305!	\"\306	\307\310\311	!\312#\"\207" [arg patch-buf 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] 6 (#$ . 37358) "P"])
(byte-code "\300\301\302\"\210\300\303\304\"\207" [defalias epatch ediff-patch-file epatch-buffer ediff-patch-buffer] 3)
#@345 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.
(defalias 'ediff-revision #[(&optional file startup-hooks) ";\204\306\307	\203\n\202\310 \311$\312!\210\313 \203,\314\315\316\317 \"!\203,\320p!\210\321\211\322\315\323\324!\"!\322\315\325\324!\"!\326 \210\327\315\330\"!
\f#*\207" [file ediff-use-last-dir ediff-last-dir-A default-directory rev2 rev1 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" ediff-version-control-package startup-hooks] 5 (#$ . 38296) "P"])
(defalias 'erevision 'ediff-revision)
(defalias 'ediff-load-version-control #[(&optional silent) "\302\303!\210\304!\206\"\305\306!!\203\307\310!\210\302!\207	\206\"\311\312\"\207" [ediff-version-control-package silent require ediff-vers featurep locate-library symbol-name message "" user-error "Version control package %S.el not found.  Use vc.el instead"] 3])
#@97 Return string describing the version of Ediff.
When called interactively, displays the version.
(defalias 'ediff-version #[nil "\302\303!\203\f\304\305\300 \"\207\306\307	#\207" [ediff-version ediff-date called-interactively-p interactive message "%s" format "Ediff %s of %s"] 4 (#$ . 39805) nil])
#@64 Display Ediff's manual.
With optional NODE, goes to that node.
(defalias 'ediff-documentation #[(&optional node) "	\306 \210\3071*\310\311\312!!\210\313\314!\210\f\203 \315\f!\210\202$\316\317!\210\320 0\202\245\210\321\322!\210
#r\311$!q\210p\323 \210#\324\211%&\325\211'\325()\326 \210\327\330!\210+\211*\211+\211,\205p\331,!\205p\332\331,!!)\203\200r+q\210\333 \210)\202\214-\334=\204\214\335.!\210\336/!\210\337*!\210+\340!\205\245\341!\210\342\n\"*\207" [ediff-control-window ediff-control-buffer ctl-buf ctl-window node default-directory 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 #1=#:old-dir ediff-msg-buffer buffer-read-only buffer-file-name buffer-undo-list inhibit-modification-hooks inhibit-read-only #2=#:buf standard-output buf this-command ediff-KILLED-VITAL-BUFFER ediff-BAD-INFO] 4 (#$ . 40111) nil])
#@62 Call `ediff-files' with the next two command line arguments.
(defalias 'ediff-files-command #[nil "@A@AA\303\n	\"*\207" [command-line-args-left file-b file-a ediff] 3 (#$ . 41321)])
#@65 Call `ediff3-files' with the next three command line arguments.
(defalias 'ediff3-files-command #[nil "@A@\3048\305\233\306\n	#+\207" [command-line-args-left file-c file-b file-a 2 3 ediff3] 4 (#$ . 41515)])
#@68 Call `ediff-merge-files' with the next two command line arguments.
(defalias 'ediff-merge-command #[nil "@A@AA\303\n	\"*\207" [command-line-args-left file-b file-a ediff-merge-files] 3 (#$ . 41738)])
#@84 Call `ediff-merge-files-with-ancestor' with the next three command line arguments.
(defalias 'ediff-merge-with-ancestor-command #[nil "@A@\3048\305\233\306\n	#+\207" [command-line-args-left ancestor file-b file-a 2 3 ediff-merge-files-with-ancestor] 4 (#$ . 41950)])
#@70 Call `ediff-directories' with the next three command line arguments.
(defalias 'ediff-directories-command #[nil "@A@\3048\305\233\306\n	#+\207" [command-line-args-left regexp file-b file-a 2 3 ediff-directories] 4 (#$ . 42232)])
#@70 Call `ediff-directories3' with the next four command line arguments.
(defalias 'ediff-directories3-command #[nil "@A@\3058\3068\307\233\310\f\n	$,\207" [command-line-args-left regexp file-c file-b file-a 2 3 4 ediff-directories3] 5 (#$ . 42476)])
#@76 Call `ediff-merge-directories' with the next three command line arguments.
(defalias 'ediff-merge-directories-command #[nil "@A@\3048\305\233\306\n	#+\207" [command-line-args-left regexp file-b file-a 2 3 ediff-merge-directories] 4 (#$ . 42740)])
#@89 Call `ediff-merge-directories-with-ancestor' with the next four command line arguments.
(defalias 'ediff-merge-directories-with-ancestor-command #[nil "@A@\3058\3068\307\233\310\f\n	$,\207" [command-line-args-left regexp ancestor file-b file-a 2 3 4 ediff-merge-directories-with-ancestor] 5 (#$ . 43002)])
(byte-code "\300\301!\210\302\303!\207" [require ediff-util run-hooks ediff-load-hook] 2)