diff options
Diffstat (limited to 'lisp/ediff-vers.el')
| -rw-r--r-- | lisp/ediff-vers.el | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 5730d52062d..cec2d6f2ccf 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el @@ -31,15 +31,16 @@ (defvar cvs-program) (defvar cvs-cookie-handle) -(eval-when-compile - (load "pcl-cvs" 'noerror) - (load "rcs" 'noerror) - (load "generic-sc" 'noerror) - (load "vc" 'noerror)) +(and noninteractive + (eval-when-compile + (load "pcl-cvs" 'noerror) + (load "rcs" 'noerror) + (load "generic-sc" 'noerror) + (load "vc" 'noerror))) ;; end pacifier ;; VC.el support -(defun vc-ediff-internal (rev1 rev2 &optional startup-hooks) +(defun ediff-vc-internal (rev1 rev2 &optional startup-hooks) ;; Run Ediff on versions of the current buffer. ;; If REV2 is "" then compare current buffer with REV1. ;; If the current buffer is named `F', the version is named `F.~REV~'. @@ -103,7 +104,7 @@ (erase-buffer)) buf)) -(defun rcs-ediff-internal (rev1 rev2 &optional startup-hooks) +(defun ediff-rcs-internal (rev1 rev2 &optional startup-hooks) ;; Run Ediff on versions of the current buffer. ;; If REV2 is "" then use current buffer. (let ((rev2buf (if (string= rev2 "") @@ -124,7 +125,7 @@ (eval "main/LATEST")) (t (eval "")))) -(defun generic-sc-ediff-internal (rev1 rev2 &optional startup-hooks) +(defun ediff-generic-sc-internal (rev1 rev2 &optional startup-hooks) ;; Run Ediff on versions of the current buffer. ;; If REV2 is "" then compare current buffer with REV1. ;; If the current buffer is named `F', the version is named `F.~REV~'. @@ -144,7 +145,7 @@ ;;; Merge with Version Control -(defun vc-ediff-merge-internal (rev1 rev2 ancestor-rev &optional startup-hooks) +(defun ediff-vc-merge-internal (rev1 rev2 ancestor-rev &optional startup-hooks) ;; If ANCESTOR-REV non-nil, merge with ancestor (let (buf1 buf2 ancestor-buf) (save-excursion @@ -177,7 +178,7 @@ (ediff-merge-buffers buf1 buf2 startup-hooks 'ediff-merge-revisions)) )) -(defun rcs-ediff-merge-internal (rev1 rev2 ancestor-rev +(defun ediff-rcs-merge-internal (rev1 rev2 ancestor-rev &optional startup-hooks) ;; If ANCESTOR-REV non-nil, merge with ancestor (let (buf1 buf2 ancestor-buf) @@ -197,7 +198,7 @@ startup-hooks 'ediff-merge-revisions-with-ancestor) (ediff-merge-buffers buf1 buf2 startup-hooks 'ediff-merge-revisions)))) -(defun generic-sc-ediff-merge-internal (rev1 rev2 ancestor-rev +(defun ediff-generic-sc-merge-internal (rev1 rev2 ancestor-rev &optional startup-hooks) ;; If ANCESTOR-REV non-nil, merge with ancestor (let (buf1 buf2 ancestor-buf) @@ -224,7 +225,7 @@ ;; PCL-CVS.el support -(defun pcl-cvs-ediff-internal (rev1 rev2 &optional startup-hooks) +(defun ediff-pcl-cvs-internal (rev1 rev2 &optional startup-hooks) ;; Run Ediff on a pair of revisions of the current buffer. ;; If REV1 is "", use the latest revision. ;; If REV2 is "", use the current buffer as the second file to compare. @@ -251,7 +252,7 @@ ;; This function is the standard Ediff's interface to pcl-cvs. ;; Works like with other interfaces: runs ediff on versions of the file in the ;; current buffer. -(defun pcl-cvs-ediff-merge-internal (rev1 rev2 ancestor-rev +(defun ediff-pcl-cvs-merge-internal (rev1 rev2 ancestor-rev &optional startup-hooks) ;; Ediff-merge appropriate revisions of the selected file. ;; If REV1 is "" then use the latest revision. @@ -358,6 +359,7 @@ ;;; Local Variables: ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1) +;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body)) ;;; End: (provide 'ediff-vers) |