(defconst ediff-version "2.70.2" "The current version of Ediff")
(defconst ediff-date "May 21, 1998" "Date of last update")
(provide 'ediff)
(defvar cvs-cookie-handle)
(defvar ediff-last-dir-patch)
(defvar ediff-patch-default-directory)
(and noninteractive
(eval-when-compile
(load-library "dired")
(load-library "info")
(load "pcl-cvs" 'noerror)))
(eval-when-compile
(let ((load-path (cons (expand-file-name ".") load-path)))
(or (featurep 'ediff-init)
(load "ediff-init.el" nil nil 'nosuffix))
(or (featurep 'ediff-mult)
(load "ediff-mult.el" nil nil 'nosuffix))
(or (featurep 'ediff-ptch)
(load "ediff-ptch.el" nil nil 'nosuffix))
(or (featurep 'ediff-vers)
(load "ediff-vers.el" nil nil 'nosuffix))
))
(require 'ediff-init)
(require 'ediff-mult)
(defgroup ediff nil
"A comprehensive visual interface to diff & patch"
:tag "Ediff"
:group 'tools)
(defcustom ediff-use-last-dir nil
"*If t, Ediff will use previous directory as default when reading file name."
:type 'boolean
:group 'ediff)
(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)
(defun ediff-set-read-only-in-buf-A ()
(ediff-with-current-buffer ediff-buffer-A
(toggle-read-only 1)))
(defun ediff-get-default-file-name ()
(cond ((eq major-mode 'dired-mode)
(let ((f (dired-get-filename nil 'no-error)))
(if (and (stringp f) (not (file-directory-p f)))
f)))
((buffer-file-name (current-buffer))
(file-name-nondirectory (buffer-file-name (current-buffer))))
))
(defun ediff-files (file-A file-B &optional startup-hooks)
"Run Ediff on a pair of files, FILE-A and FILE-B."
(interactive
(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)))
(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
(setq file-name-history
(cons (ediff-abbreviate-file-name
(expand-file-name
(file-name-nondirectory f)
dir-B))
file-name-history))
f))
)))
(ediff-files-internal file-A
(if (file-directory-p file-B)
(expand-file-name
(file-name-nondirectory file-A) file-B)
file-B)
nil startup-hooks
'ediff-files))
(defun ediff-files3 (file-A file-B file-C &optional startup-hooks)
"Run Ediff on three files, FILE-A, FILE-B, and FILE-C."
(interactive
(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)))
(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
(setq file-name-history
(cons
(ediff-abbreviate-file-name
(expand-file-name
(file-name-nondirectory f)
dir-B))
file-name-history))
f)))
(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
(setq file-name-history
(cons (ediff-abbreviate-file-name
(expand-file-name
(file-name-nondirectory ff)
dir-C))
file-name-history))
ff))
)))
(ediff-files-internal file-A
(if (file-directory-p file-B)
(expand-file-name
(file-name-nondirectory file-A) file-B)
file-B)
(if (file-directory-p file-C)
(expand-file-name
(file-name-nondirectory file-A) file-C)
file-C)
startup-hooks
'ediff-files3))
(defalias 'ediff3 'ediff-files3)
(defun ediff-find-file (file-var buffer-name &optional last-dir hooks-var)
(let* ((file (symbol-value file-var))
(file-magic (ediff-filename-magic-p file))
(temp-file-name-prefix (file-name-nondirectory file)))
(cond ((not (file-readable-p file))
(error "File `%s' does not exist or is not readable" file))
((file-directory-p file)
(error "File `%s' is a directory" file)))
(setq file (expand-file-name file))
(if last-dir
(set last-dir (expand-file-name (file-name-directory file))))
(set buffer-name (find-file-noselect file))
(ediff-with-current-buffer (symbol-value buffer-name)
(widen) (cond (file-magic (ediff-verify-file-buffer 'magic)
(setq file
(ediff-make-temp-file
(current-buffer) temp-file-name-prefix))
(set hooks-var (cons (` (lambda () (delete-file (, file))))
(symbol-value hooks-var))))
((not (equal (file-truename file)
(file-truename (buffer-file-name))))
(setq file
(ediff-make-temp-file
(current-buffer) temp-file-name-prefix))
(set hooks-var (cons (` (lambda () (delete-file (, file))))
(symbol-value hooks-var))))
(t (ediff-verify-file-buffer))))
(set file-var file)))
(defun ediff-files-internal (file-A file-B file-C startup-hooks job-name
&optional merge-buffer-file)
(let (buf-A buf-B buf-C)
(message "Reading file %s ... " file-A)
(ediff-find-file 'file-A 'buf-A 'ediff-last-dir-A 'startup-hooks)
(message "Reading file %s ... " file-B)
(ediff-find-file 'file-B 'buf-B 'ediff-last-dir-B 'startup-hooks)
(if (stringp file-C)
(progn
(message "Reading file %s ... " file-C)
(ediff-find-file
'file-C 'buf-C
(if (eq job-name 'ediff-merge-files-with-ancestor)
'ediff-last-dir-ancestor 'ediff-last-dir-C)
'startup-hooks)))
(ediff-setup buf-A file-A
buf-B file-B
buf-C file-C
startup-hooks
(list (cons 'ediff-job-name job-name))
merge-buffer-file)))
(defalias 'ediff 'ediff-files)
(defun ediff-buffers (buffer-A buffer-B &optional startup-hooks job-name)
"Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B."
(interactive
(let (bf)
(list (setq bf (read-buffer "Buffer A to compare: "
(ediff-other-buffer "") t))
(read-buffer "Buffer B to compare: "
(progn
(save-window-excursion (other-window 1))
(ediff-other-buffer bf))
t))))
(or job-name (setq job-name 'ediff-buffers))
(ediff-buffers-internal buffer-A buffer-B nil startup-hooks job-name))
(defalias 'ebuffers 'ediff-buffers)
(defun ediff-buffers3 (buffer-A buffer-B buffer-C
&optional startup-hooks job-name)
"Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C."
(interactive
(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
(save-window-excursion (other-window 1))
(ediff-other-buffer bf))
t))
(read-buffer "Buffer C to compare: "
(progn
(save-window-excursion (other-window 1))
(ediff-other-buffer (list bf bff)))
t)
)))
(or job-name (setq job-name 'ediff-buffers3))
(ediff-buffers-internal buffer-A buffer-B buffer-C startup-hooks job-name))
(defalias 'ebuffers3 'ediff-buffers3)
(defun ediff-buffers-internal (buf-A buf-B buf-C startup-hooks job-name
&optional merge-buffer-file)
(let* ((buf-A-file-name (buffer-file-name (get-buffer buf-A)))
(buf-B-file-name (buffer-file-name (get-buffer buf-B)))
(buf-C-is-alive (ediff-buffer-live-p buf-C))
(buf-C-file-name (if buf-C-is-alive
(buffer-file-name (get-buffer buf-B))))
file-A file-B file-C)
(if (not (ediff-buffer-live-p buf-A))
(error "Buffer %S doesn't exist" buf-A))
(if (not (ediff-buffer-live-p buf-B))
(error "Buffer %S doesn't exist" buf-B))
(let ((ediff-job-name job-name))
(if (and ediff-3way-comparison-job
(not buf-C-is-alive))
(error "Buffer %S doesn't exist" buf-C)))
(if (stringp buf-A-file-name)
(setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
(if (stringp buf-B-file-name)
(setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
(if (stringp buf-C-file-name)
(setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
(let ((ediff-job-name job-name))
(setq file-A (ediff-make-temp-file buf-A buf-A-file-name)
file-B (ediff-make-temp-file buf-B buf-B-file-name))
(if buf-C-is-alive
(setq file-C (ediff-make-temp-file buf-C buf-C-file-name))))
(ediff-setup (get-buffer buf-A) file-A
(get-buffer buf-B) file-B
(if buf-C-is-alive (get-buffer buf-C))
file-C
(cons (` (lambda ()
(delete-file (, file-A))
(delete-file (, file-B))
(if (stringp (, file-C)) (delete-file (, file-C)))
))
startup-hooks)
(list (cons 'ediff-job-name job-name))
merge-buffer-file)))
(defun ediff-get-default-directory-name ()
(cond (ediff-use-last-dir ediff-last-dir-A)
((eq major-mode 'dired-mode)
(let ((f (dired-get-filename nil 'noerror)))
(if (and (stringp f) (file-directory-p f))
f
default-directory)))
(t default-directory)))
(defun ediff-directories (dir1 dir2 regexp)
"Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
the same name in both. The third argument, REGEXP, is a regular expression that
can be used to filter out certain file names."
(interactive
(let ((dir-A (ediff-get-default-directory-name))
f)
(list (setq f (ediff-read-file-name "Directory A to compare:" dir-A nil))
(ediff-read-file-name "Directory B to compare:"
(if ediff-use-last-dir
ediff-last-dir-B
(ediff-strip-last-dir f))
nil)
(read-string "Filter through regular expression: "
nil 'ediff-filtering-regexp-history)
)))
(ediff-directories-internal
dir1 dir2 nil regexp 'ediff-files 'ediff-directories
))
(defalias 'edirs 'ediff-directories)
(defun ediff-directory-revisions (dir1 regexp)
"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."
(interactive
(let ((dir-A (ediff-get-default-directory-name)))
(list (ediff-read-file-name
"Directory to compare with revision:" dir-A nil)
(read-string "Filter through regular expression: "
nil 'ediff-filtering-regexp-history)
)))
(ediff-directory-revisions-internal
dir1 regexp 'ediff-revision 'ediff-directory-revisions
))
(defalias 'edir-revisions 'ediff-directory-revisions)
(defun ediff-directories3 (dir1 dir2 dir3 regexp)
"Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
have the same name in all three. The last argument, REGEXP, is a regular
expression that can be used to filter out certain file names."
(interactive
(let ((dir-A (ediff-get-default-directory-name))
f)
(list (setq f (ediff-read-file-name "Directory A to compare:" dir-A nil))
(setq f (ediff-read-file-name "Directory B to compare:"
(if ediff-use-last-dir
ediff-last-dir-B
(ediff-strip-last-dir f))
nil))
(ediff-read-file-name "Directory C to compare:"
(if ediff-use-last-dir
ediff-last-dir-C
(ediff-strip-last-dir f))
nil)
(read-string "Filter through regular expression: "
nil 'ediff-filtering-regexp-history)
)))
(ediff-directories-internal
dir1 dir2 dir3 regexp 'ediff-files3 'ediff-directories3
))
(defalias 'edirs3 'ediff-directories3)
(defun ediff-merge-directories (dir1 dir2 regexp)
"Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
the same name in both. The third argument, REGEXP, is a regular expression that
can be used to filter out certain file names."
(interactive
(let ((dir-A (ediff-get-default-directory-name))
f)
(list (setq f (ediff-read-file-name "Directory A to merge:" dir-A nil))
(ediff-read-file-name "Directory B to merge:"
(if ediff-use-last-dir
ediff-last-dir-B
(ediff-strip-last-dir f))
nil)
(read-string "Filter through regular expression: "
nil 'ediff-filtering-regexp-history)
)))
(ediff-directories-internal
dir1 dir2 nil regexp 'ediff-merge-files 'ediff-merge-directories
))
(defalias 'edirs-merge 'ediff-merge-directories)
(defun ediff-merge-directories-with-ancestor (dir1 dir2 ancestor-dir regexp)
"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 a regular expression that
can be used to filter out certain file names."
(interactive
(let ((dir-A (ediff-get-default-directory-name))
f)
(list (setq f (ediff-read-file-name "Directory A to merge:" dir-A nil))
(setq f (ediff-read-file-name "Directory B to merge:"
(if ediff-use-last-dir
ediff-last-dir-B
(ediff-strip-last-dir f))
nil))
(ediff-read-file-name "Ancestor directory:"
(if ediff-use-last-dir
ediff-last-dir-C
(ediff-strip-last-dir f))
nil)
(read-string "Filter through regular expression: "
nil 'ediff-filtering-regexp-history)
)))
(ediff-directories-internal
dir1 dir2 ancestor-dir regexp
'ediff-merge-files-with-ancestor 'ediff-merge-directories-with-ancestor
))
(defun ediff-merge-directory-revisions (dir1 regexp)
"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."
(interactive
(let ((dir-A (ediff-get-default-directory-name)))
(list (ediff-read-file-name
"Directory to merge with revisions:" dir-A nil)
(read-string "Filter through regular expression: "
nil 'ediff-filtering-regexp-history)
)))
(ediff-directory-revisions-internal
dir1 regexp 'ediff-merge-revisions 'ediff-merge-directory-revisions
))
(defalias 'edir-merge-revisions 'ediff-merge-directory-revisions)
(defun ediff-merge-directory-revisions-with-ancestor (dir1 regexp)
"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."
(interactive
(let ((dir-A (ediff-get-default-directory-name)))
(list (ediff-read-file-name
"Directory to merge with revisions and ancestors:" dir-A nil)
(read-string "Filter through regular expression: "
nil 'ediff-filtering-regexp-history)
)))
(ediff-directory-revisions-internal
dir1 regexp 'ediff-merge-revisions-with-ancestor
'ediff-merge-directory-revisions-with-ancestor
))
(defalias
'edir-merge-revisions-with-ancestor
'ediff-merge-directory-revisions-with-ancestor)
(defalias 'edirs-merge-with-ancestor 'ediff-merge-directories-with-ancestor)
(defun ediff-directories-internal (dir1 dir2 dir3 regexp action jobname
&optional startup-hooks)
(setq dir1 (if (file-directory-p dir1) dir1 (file-name-directory dir1))
dir2 (if (file-directory-p dir2) dir2 (file-name-directory dir2)))
(if (stringp dir3)
(setq dir3 (if (file-directory-p dir3) dir3 (file-name-directory dir3))))
(cond ((string= dir1 dir2)
(error "Directories A and B are the same: %s" dir1))
((and (eq jobname 'ediff-directories3)
(string= dir1 dir3))
(error "Directories A and C are the same: %s" dir1))
((and (eq jobname 'ediff-directories3)
(string= dir2 dir3))
(error "Directories B and C are the same: %s" dir1)))
(let (diffs merge-autostore-dir
file-list meta-buf)
(if (and ediff-autostore-merges (ediff-merge-metajob jobname))
(setq merge-autostore-dir
(ediff-read-file-name "Directory to save merged files:"
(if ediff-use-last-dir
ediff-last-merge-autostore-dir
(ediff-strip-last-dir dir1))
nil)))
(if (stringp merge-autostore-dir)
(cond ((and (stringp dir1) (string= merge-autostore-dir dir1))
(or (y-or-n-p "Merge directory same as directory A, sure? ")
(error "Directory merge aborted")))
((and (stringp dir2) (string= merge-autostore-dir dir2))
(or (y-or-n-p "Merge directory same as directory B, sure? ")
(error "Directory merge aborted")))
((and (stringp dir3) (string= merge-autostore-dir dir3))
(or (y-or-n-p
"Merge directory same as ancestor directory, sure? ")
(error "Directory merge aborted")))))
(setq file-list (ediff-intersect-directories
jobname 'diffs
regexp dir1 dir2 dir3 merge-autostore-dir))
(setq startup-hooks
(cons (` (lambda ()
(setq ediff-session-action-function (quote (, action)))
(setq ediff-dir-difference-list (quote (, diffs)))))
startup-hooks))
(setq meta-buf (ediff-prepare-meta-buffer
'ediff-filegroup-action
file-list
"*Ediff Session Group Panel"
'ediff-redraw-directory-group-buffer
jobname
startup-hooks))
(ediff-show-meta-buffer meta-buf)
))
(defun ediff-directory-revisions-internal (dir1 regexp action jobname
&optional startup-hooks)
(setq dir1 (if (file-directory-p dir1) dir1 (file-name-directory dir1)))
(let (file-list meta-buf merge-autostore-dir)
(if (and ediff-autostore-merges (ediff-merge-metajob jobname))
(setq merge-autostore-dir
(ediff-read-file-name "Directory to save merged files:"
(if ediff-use-last-dir
ediff-last-merge-autostore-dir
(ediff-strip-last-dir dir1))
nil)))
(if (and (stringp merge-autostore-dir)
(stringp dir1)
(string= merge-autostore-dir dir1))
(or (y-or-n-p
"Directory for saving merges is the same as directory A. Sure? ")
(error "Merge of directory revisions aborted")))
(setq file-list
(ediff-get-directory-files-under-revision
jobname regexp dir1 merge-autostore-dir))
(setq startup-hooks
(cons (` (lambda ()
(setq ediff-session-action-function (quote (, action)))
))
startup-hooks))
(setq meta-buf (ediff-prepare-meta-buffer
'ediff-filegroup-action
file-list
"*Ediff Session Group Panel"
'ediff-redraw-directory-group-buffer
jobname
startup-hooks))
(ediff-show-meta-buffer meta-buf)
))
(defun ediff-windows-wordwise (dumb-mode &optional wind-A wind-B startup-hooks)
"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."
(interactive "P")
(ediff-windows dumb-mode wind-A wind-B
startup-hooks 'ediff-windows-wordwise 'word-mode))
(defun ediff-windows-linewise (dumb-mode &optional wind-A wind-B startup-hooks)
"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."
(interactive "P")
(ediff-windows dumb-mode wind-A wind-B
startup-hooks 'ediff-windows-linewise nil))
(defun ediff-windows (dumb-mode wind-A wind-B startup-hooks job-name word-mode)
(if (or dumb-mode (not (ediff-window-display-p)))
(setq wind-A (ediff-get-next-window wind-A nil)
wind-B (ediff-get-next-window wind-B wind-A))
(setq wind-A (ediff-get-window-by-clicking wind-A nil 1)
wind-B (ediff-get-window-by-clicking wind-B wind-A 2)))
(let ((buffer-A (window-buffer wind-A))
(buffer-B (window-buffer wind-B))
beg-A end-A beg-B end-B)
(save-excursion
(save-window-excursion
(sit-for 0) (select-window wind-A)
(setq beg-A (window-start)
end-A (window-end))
(select-window wind-B)
(setq beg-B (window-start)
end-B (window-end))))
(ediff-regions-internal
buffer-A beg-A end-A buffer-B beg-B end-B
startup-hooks job-name word-mode nil)))
(defun ediff-regions-wordwise (buffer-A buffer-B &optional startup-hooks)
"Run Ediff on a pair of regions in two different buffers.
Regions \(i.e., point and mark\) are assumed to be set in advance.
This function is effective only for relatively small regions, up to 200
lines. For large regions, use `ediff-regions-linewise'."
(interactive
(let (bf)
(list (setq bf (read-buffer "Region's A buffer: "
(ediff-other-buffer "") t))
(read-buffer "Region's B buffer: "
(progn
(save-window-excursion (other-window 1))
(ediff-other-buffer bf))
t))))
(if (not (ediff-buffer-live-p buffer-A))
(error "Buffer %S doesn't exist" buffer-A))
(if (not (ediff-buffer-live-p buffer-B))
(error "Buffer %S doesn't exist" buffer-B))
(let (reg-A-beg reg-A-end reg-B-beg reg-B-end)
(save-excursion
(set-buffer buffer-A)
(setq reg-A-beg (region-beginning)
reg-A-end (region-end))
(set-buffer buffer-B)
(setq reg-B-beg (region-beginning)
reg-B-end (region-end)))
(ediff-regions-internal
(get-buffer buffer-A) reg-A-beg reg-A-end
(get-buffer buffer-B) reg-B-beg reg-B-end
startup-hooks 'ediff-regions-wordwise 'word-mode nil)))
(defun ediff-regions-linewise (buffer-A buffer-B &optional startup-hooks)
"Run Ediff on a pair of regions in two different buffers.
Regions \(i.e., point and mark\) are assumed to be set in advance.
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'."
(interactive
(let (bf)
(list (setq bf (read-buffer "Region A's buffer: "
(ediff-other-buffer "") t))
(read-buffer "Region B's buffer: "
(progn
(save-window-excursion (other-window 1))
(ediff-other-buffer bf))
t))))
(if (not (ediff-buffer-live-p buffer-A))
(error "Buffer %S doesn't exist" buffer-A))
(if (not (ediff-buffer-live-p buffer-B))
(error "Buffer %S doesn't exist" buffer-B))
(let (reg-A-beg reg-A-end reg-B-beg reg-B-end)
(save-excursion
(set-buffer buffer-A)
(setq reg-A-beg (region-beginning)
reg-A-end (region-end))
(goto-char reg-A-beg)
(beginning-of-line)
(setq reg-A-beg (point))
(goto-char reg-A-end)
(end-of-line)
(or (eobp) (forward-char)) (setq reg-A-end (point))
(set-buffer buffer-B)
(setq reg-B-beg (region-beginning)
reg-B-end (region-end))
(goto-char reg-B-beg)
(beginning-of-line)
(setq reg-B-beg (point))
(goto-char reg-B-end)
(end-of-line)
(or (eobp) (forward-char)) (setq reg-B-end (point))
)
(ediff-regions-internal
(get-buffer buffer-A) reg-A-beg reg-A-end
(get-buffer buffer-B) reg-B-beg reg-B-end
startup-hooks 'ediff-regions-linewise nil nil)))
(defun ediff-regions-internal (buffer-A beg-A end-A buffer-B beg-B end-B
startup-hooks job-name word-mode
setup-parameters)
(let ((tmp-buffer (get-buffer-create ediff-tmp-buffer))
overl-A overl-B
file-A file-B)
(ediff-with-current-buffer buffer-A
(setq beg-A (move-marker (make-marker) beg-A)
end-A (move-marker (make-marker) end-A)))
(ediff-with-current-buffer buffer-B
(setq beg-B (move-marker (make-marker) beg-B)
end-B (move-marker (make-marker) end-B)))
(if (and (eq buffer-A buffer-B)
(or (and (< beg-A end-B) (<= beg-B beg-A)) (and (< beg-B end-A) (<= end-A end-B)))) (progn
(with-output-to-temp-buffer ediff-msg-buffer
(princ "
You have requested to compare overlapping regions of the same buffer.
In this case, Ediff's highlighting may be confusing---in the same window,
you may see highlighted regions that belong to different regions.
Continue anyway? (y/n) "))
(if (y-or-n-p "Continue anyway? ")
()
(error "%S aborted" job-name))))
(if word-mode
(ediff-wordify beg-A end-A buffer-A tmp-buffer)
(ediff-copy-to-buffer beg-A end-A buffer-A tmp-buffer))
(setq file-A (ediff-make-temp-file tmp-buffer "regA"))
(if word-mode
(ediff-wordify beg-B end-B buffer-B tmp-buffer)
(ediff-copy-to-buffer beg-B end-B buffer-B tmp-buffer))
(setq file-B (ediff-make-temp-file tmp-buffer "regB"))
(setq overl-A (ediff-make-bullet-proof-overlay beg-A end-A buffer-A))
(setq overl-B (ediff-make-bullet-proof-overlay beg-B end-B buffer-B))
(ediff-setup buffer-A file-A
buffer-B file-B
nil nil (cons (` (lambda ()
(delete-file (, file-A))
(delete-file (, file-B))))
startup-hooks)
(append
(list (cons 'ediff-word-mode word-mode)
(cons 'ediff-narrow-bounds (list overl-A overl-B))
(cons 'ediff-job-name job-name))
setup-parameters))
))
(defalias 'ediff-merge 'ediff-merge-files)
(defsubst ediff-merge-on-startup ()
(ediff-do-merge 0)
(ediff-with-current-buffer ediff-buffer-C
(set-buffer-modified-p nil)))
(defun ediff-merge-files (file-A file-B
&optional startup-hooks merge-buffer-file)
"Merge two files without ancestor."
(interactive
(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)))
(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
(setq file-name-history
(cons (ediff-abbreviate-file-name
(expand-file-name
(file-name-nondirectory f)
dir-B))
file-name-history))
f))
)))
(setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
(ediff-files-internal file-A
(if (file-directory-p file-B)
(expand-file-name
(file-name-nondirectory file-A) file-B)
file-B)
nil startup-hooks
'ediff-merge-files
merge-buffer-file))
(defun ediff-merge-files-with-ancestor (file-A file-B file-ancestor
&optional
startup-hooks
merge-buffer-file)
"Merge two files with ancestor."
(interactive
(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)))
(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
(setq file-name-history
(cons
(ediff-abbreviate-file-name
(expand-file-name
(file-name-nondirectory f)
dir-B))
file-name-history))
f)))
(ediff-read-file-name "Ancestor file"
(setq dir-ancestor
(if ediff-use-last-dir
ediff-last-dir-ancestor
(file-name-directory ff)))
(progn
(setq file-name-history
(cons (ediff-abbreviate-file-name
(expand-file-name
(file-name-nondirectory ff)
dir-ancestor))
file-name-history))
ff))
)))
(setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
(ediff-files-internal file-A
(if (file-directory-p file-B)
(expand-file-name
(file-name-nondirectory file-A) file-B)
file-B)
file-ancestor
startup-hooks
'ediff-merge-files-with-ancestor
merge-buffer-file))
(defalias 'ediff-merge-with-ancestor 'ediff-merge-files-with-ancestor)
(defun ediff-merge-buffers (buffer-A buffer-B
&optional
startup-hooks job-name merge-buffer-file)
"Merge buffers without ancestor."
(interactive
(let (bf)
(list (setq bf (read-buffer "Buffer A to merge: "
(ediff-other-buffer "") t))
(read-buffer "Buffer B to merge: "
(progn
(save-window-excursion (other-window 1))
(ediff-other-buffer bf))
t))))
(setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
(or job-name (setq job-name 'ediff-merge-buffers))
(ediff-buffers-internal
buffer-A buffer-B nil startup-hooks job-name merge-buffer-file))
(defun ediff-merge-buffers-with-ancestor (buffer-A buffer-B buffer-ancestor
&optional
startup-hooks
job-name
merge-buffer-file)
"Merge buffers with ancestor."
(interactive
(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
(save-window-excursion (other-window 1))
(ediff-other-buffer bf))
t))
(read-buffer "Ancestor buffer: "
(progn
(save-window-excursion (other-window 1))
(ediff-other-buffer (list bf bff)))
t)
)))
(setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
(or job-name (setq job-name 'ediff-merge-buffers-with-ancestor))
(ediff-buffers-internal
buffer-A buffer-B buffer-ancestor startup-hooks job-name merge-buffer-file))
(defun ediff-merge-revisions (&optional file startup-hooks merge-buffer-file)
"Run Ediff by merging two revisions of a file.
The file is the optional FILE argument or the file visited by the current
buffer."
(interactive)
(if (stringp file) (find-file file))
(let (rev1 rev2)
(setq rev1
(read-string
(format
"Version 1 to merge (default: %s's latest version): "
(if (stringp file)
(file-name-nondirectory file) "current buffer")))
rev2
(read-string
(format
"Version 2 to merge (default: %s): "
(if (stringp file)
(file-name-nondirectory file) "current buffer"))))
(ediff-load-version-control)
(funcall
(intern (format "ediff-%S-merge-internal" ediff-version-control-package))
rev1 rev2 nil startup-hooks merge-buffer-file)))
(defun ediff-merge-revisions-with-ancestor (&optional
file startup-hooks
merge-buffer-file)
"Run Ediff by merging two revisions of a file with a common ancestor.
The file is the the optional FILE argument or the file visited by the current
buffer."
(interactive)
(if (stringp file) (find-file file))
(let (rev1 rev2 ancestor-rev)
(setq rev1
(read-string
(format
"Version 1 to merge (default: %s's latest version): "
(if (stringp file)
(file-name-nondirectory file) "current buffer")))
rev2
(read-string
(format
"Version 2 to merge (default: %s): "
(if (stringp file)
(file-name-nondirectory file) "current buffer")))
ancestor-rev
(read-string
(format
"Ancestor version (default: %s): "
(if (stringp file)
(file-name-nondirectory file) "current buffer"))))
(ediff-load-version-control)
(funcall
(intern (format "ediff-%S-merge-internal" ediff-version-control-package))
rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
(defun run-ediff-from-cvs-buffer (pos)
"Run Ediff-merge on appropriate revisions of the selected file.
First run after `M-x cvs-update'. Then place the cursor on a line describing a
file and then run `run-ediff-from-cvs-buffer'."
(interactive "d")
(ediff-load-version-control)
(let ((tin (tin-locate cvs-cookie-handle pos)))
(if tin
(cvs-run-ediff-on-file-descriptor tin)
(error "There is no file to merge"))))
(defun ediff-patch-file ()
"Run Ediff by patching SOURCE-FILENAME."
(interactive)
(let (source-dir source-file patch-buf)
(require 'ediff-ptch)
(setq patch-buf (ediff-get-patch-buffer))
(setq source-dir (cond (ediff-use-last-dir ediff-last-dir-patch)
((and (not ediff-patch-default-directory)
(buffer-file-name patch-buf))
(file-name-directory
(expand-file-name
(buffer-file-name patch-buf))))
(t default-directory)))
(setq source-file
(ediff-read-file-name
"Which file to patch? " source-dir (ediff-get-default-file-name)))
(ediff-dispatch-file-patching-job patch-buf source-file)))
(defun ediff-patch-buffer ()
"Run Ediff by patching BUFFER-NAME."
(interactive)
(let (patch-buf)
(require 'ediff-ptch)
(setq patch-buf (ediff-get-patch-buffer))
(ediff-patch-buffer-internal
patch-buf
(read-buffer "Which buffer to patch? "
(cond ((eq patch-buf (current-buffer))
(ediff-other-buffer (current-buffer)))
(t (current-buffer)))
'must-match))))
(defalias 'epatch 'ediff-patch-file)
(defalias 'epatch-buffer 'ediff-patch-buffer)
(defun ediff-revision (&optional file startup-hooks)
"Run Ediff by comparing versions of a file.
The file is an optional FILE argument or the file visited by the current
buffer. Use `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
(interactive "P")
(if (stringp file) (find-file file))
(let (rev1 rev2)
(setq rev1
(read-string
(format "Version 1 to compare (default: %s's latest version): "
(if (stringp file)
(file-name-nondirectory file) "current buffer")))
rev2
(read-string
(format "Version 2 to compare (default: %s): "
(if (stringp file)
(file-name-nondirectory file) "current buffer"))))
(ediff-load-version-control)
(funcall
(intern (format "ediff-%S-internal" ediff-version-control-package))
rev1 rev2 startup-hooks)
))
(defalias 'erevision 'ediff-revision)
(defun ediff-load-version-control (&optional silent)
(require 'ediff-vers)
(or (featurep ediff-version-control-package)
(if (locate-library (symbol-name ediff-version-control-package))
(progn
(message "") (require ediff-version-control-package))
(or silent
(error "Version control package %S.el not found. Use vc.el instead"
ediff-version-control-package)))))
(defun ediff-version ()
"Return string describing the version of Ediff.
When called interactively, displays the version."
(interactive)
(if (interactive-p)
(message (ediff-version))
(format "Ediff %s of %s" ediff-version ediff-date)))
(defun ediff-documentation (&optional node)
"Display Ediff's manual.
With optional NODE, goes to that node."
(interactive)
(let ((ctl-window ediff-control-window)
(ctl-buf ediff-control-buffer))
(ediff-skip-unsuitable-frames)
(condition-case nil
(progn
(pop-to-buffer (get-buffer-create "*info*"))
(info (if ediff-xemacs-p "ediff.info" "ediff"))
(if node
(Info-goto-node node)
(message "Type `i' to search for a specific topic"))
(raise-frame (selected-frame)))
(error (beep 1)
(with-output-to-temp-buffer ediff-msg-buffer
(princ ediff-BAD-INFO))
(if (window-live-p ctl-window)
(progn
(select-window ctl-window)
(set-window-buffer ctl-window ctl-buf)))))))
(require 'ediff-util)