Move version control related files to the "vc" subdirectory.

* add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el,
* ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el,
* ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el,
* ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el,
* pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el,
* smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el,
* vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el,
* vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el:
Move files to the "vc" subdirectory.

1 files changed, 0 insertions, 239 deletions

diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
deleted file mode 100644
index e314afc24b5..00000000000
--- a/lisp/ediff-vers.el
+++ /dev/null
@@ -1,239 +0,0 @@
-;;; ediff-vers.el --- version control interface to Ediff
-
-;; Copyright (C) 1995, 1996, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-
-;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;; Code:
-
-;; Compiler pacifier
-(defvar rcs-default-co-switches)
-
-(and noninteractive
-     (eval-when-compile
-       (condition-case nil
-	   ;; for compatibility with current stable version of xemacs
-	   (progn
-	     ;;(require 'pcvs nil 'noerror)
-	     ;;(require 'rcs nil 'noerror)
-	     (require 'pcvs)
-	     (require 'rcs))
-	 (error nil))
-       (require 'vc)
-       (require 'ediff-init)
-       ))
-;; end pacifier
-
-(defcustom ediff-keep-tmp-versions nil
-  "If t, do not delete temporary previous versions for the files on which
-comparison or merge operations are being performed."
-  :type 'boolean
-  :group 'ediff-vers
-  )
-
-(defalias 'ediff-vc-revision-other-window
-      (if (fboundp 'vc-revision-other-window)
-	  'vc-revision-other-window
-	'vc-version-other-window))
-
-(defalias 'ediff-vc-working-revision
-  (if (fboundp 'vc-working-revision)
-      'vc-working-revision
-    'vc-workfile-version))
-
-;; VC.el support
-
-(eval-when-compile
-  (require 'vc-hooks)) ;; for vc-call macro
-
-
-(defun ediff-vc-latest-version (file)
-  "Return the version level of the latest version of FILE in repository."
-  (if (fboundp 'vc-latest-version)
-      (vc-latest-version file)
-    (or (vc-file-getprop file 'vc-latest-revision)
-	(cond ((vc-backend file)
-	       (vc-call state file)
-	       (vc-file-getprop file 'vc-latest-revision))
-	      (t (error "File %s is not under version control" file))))
-    ))
-
-
-(defun ediff-vc-internal (rev1 rev2 &optional startup-hooks)
-  ;; Run Ediff on versions of the current buffer.
-  ;; If REV1 is "", use the latest version of the current buffer's file.
-  ;; If REV2 is "" then compare current buffer with REV1.
-  ;; If the current buffer is named `F', the version is named `F.~REV~'.
-  ;; If `F.~REV~' already exists, it is used instead of being re-created.
-  (let (file1 file2 rev1buf rev2buf)
-    (if (string= rev1 "")
-	(setq rev1 (ediff-vc-latest-version (buffer-file-name))))
-    (save-window-excursion
-      (save-excursion
-	(ediff-vc-revision-other-window rev1)
-	(setq rev1buf (current-buffer)
-	      file1 (buffer-file-name)))
-      (save-excursion
-	(or (string= rev2 "") 		; use current buffer
-	    (ediff-vc-revision-other-window rev2))
-	(setq rev2buf (current-buffer)
-	      file2 (buffer-file-name)))
-      (setq startup-hooks
-	    (cons `(lambda ()
-		     (ediff-delete-version-file ,file1)
-		     (or ,(string= rev2 "") (ediff-delete-version-file ,file2)))
-		  startup-hooks)))
-    (ediff-buffers
-     rev1buf rev2buf
-     startup-hooks
-     'ediff-revision)))
-
-;; RCS.el support
-(defun rcs-ediff-view-revision (&optional rev)
-;; View previous RCS revision of current file.
-;; With prefix argument, prompts for a revision name.
-  (interactive (list (if current-prefix-arg
-			 (read-string "Revision: "))))
-  (let* ((filename (buffer-file-name (current-buffer)))
-	 (switches (append '("-p")
-			   (if rev (list (concat "-r" rev)) nil)))
-	 (buff (concat (file-name-nondirectory filename) ".~" rev "~")))
-    (message "Working ...")
-    (setq filename (expand-file-name filename))
-    (with-output-to-temp-buffer buff
-      (ediff-with-current-buffer standard-output
-	(fundamental-mode))
-      (let ((output-buffer (ediff-rcs-get-output-buffer filename buff)))
-	(delete-windows-on output-buffer)
-	(with-current-buffer output-buffer
-	  (apply 'call-process "co" nil t nil
-		 ;; -q: quiet (no diagnostics)
-		 (append switches rcs-default-co-switches
-			 (list "-q" filename)))))
-      (message "")
-      buff)))
-
-(defun ediff-rcs-get-output-buffer (file name)
-  ;; Get a buffer for RCS output for FILE, make it writable and clean it up.
-  ;; Optional NAME is name to use instead of `*RCS-output*'.
-  ;; This is a modified version from rcs.el v1.1.  I use it here to make
-  ;; Ediff immune to changes in rcs.el
-  (let ((buf (get-buffer-create name)))
-    (with-current-buffer buf
-      (setq buffer-read-only nil
-	    default-directory (file-name-directory (expand-file-name file)))
-      (erase-buffer))
-    buf))
-
-(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 rev1buf)
-    (save-window-excursion
-      (setq rev2buf (if (string= rev2 "")
-			(current-buffer)
-		      (rcs-ediff-view-revision rev2))
-	    rev1buf (rcs-ediff-view-revision rev1)))
-
-    ;; rcs.el doesn't create temp version files, so we don't have to delete
-    ;; anything in startup hooks to ediff-buffers
-    (ediff-buffers rev1buf rev2buf startup-hooks 'ediff-revision)
-    ))
-
-;;; Merge with Version Control
-
-(defun ediff-vc-merge-internal (rev1 rev2 ancestor-rev
-				     &optional startup-hooks merge-buffer-file)
-;; If ANCESTOR-REV non-nil, merge with ancestor
-  (let (buf1 buf2 ancestor-buf)
-    (save-window-excursion
-      (save-excursion
-	(ediff-vc-revision-other-window rev1)
-	(setq buf1 (current-buffer)))
-      (save-excursion
-	(or (string= rev2 "")
-	    (ediff-vc-revision-other-window rev2))
-	(setq buf2 (current-buffer)))
-      (if ancestor-rev
-	  (save-excursion
-	    (if (string= ancestor-rev "")
-		(setq ancestor-rev (ediff-vc-working-revision buffer-file-name)))
-	    (ediff-vc-revision-other-window ancestor-rev)
-	    (setq ancestor-buf (current-buffer))))
-      (setq startup-hooks
-	    (cons
-	     `(lambda ()
-		(ediff-delete-version-file ,(buffer-file-name buf1))
-		(or ,(string= rev2 "")
-		    (ediff-delete-version-file ,(buffer-file-name buf2)))
-		(or ,(string= ancestor-rev "")
-		    ,(not ancestor-rev)
-		    (ediff-delete-version-file ,(buffer-file-name ancestor-buf)))
-		)
-	     startup-hooks)))
-    (if ancestor-rev
-	(ediff-merge-buffers-with-ancestor
-	 buf1 buf2 ancestor-buf
-	 startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)
-      (ediff-merge-buffers
-       buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))
-    ))
-
-(defun ediff-rcs-merge-internal (rev1 rev2 ancestor-rev
-				      &optional
-				      startup-hooks merge-buffer-file)
-  ;; If ANCESTOR-REV non-nil, merge with ancestor
-  (let (buf1 buf2 ancestor-buf)
-    (save-window-excursion
-      (setq buf1 (rcs-ediff-view-revision rev1)
-	    buf2 (if (string= rev2 "")
-		     (current-buffer)
-		   (rcs-ediff-view-revision rev2))
-	    ancestor-buf (if ancestor-rev
-			     (if (string= ancestor-rev "")
-				 (current-buffer)
-			       (rcs-ediff-view-revision ancestor-rev)))))
-    ;; rcs.el doesn't create temp version files, so we don't have to delete
-    ;; anything in startup hooks to ediff-buffers
-    (if ancestor-rev
-	(ediff-merge-buffers-with-ancestor
-	 buf1 buf2 ancestor-buf
-	 startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)
-      (ediff-merge-buffers
-       buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))))
-
-
-;; delete version file on exit unless ediff-keep-tmp-versions is true
-(defun ediff-delete-version-file (file)
-  (or ediff-keep-tmp-versions (delete-file file)))
-
-
-(provide 'ediff-vers)
-
-
-;; Local Variables:
-;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
-;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
-;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
-;; End:
-
-;; arch-tag: bbb34f0c-2a90-426a-a77a-c75f479ebbbf
-;;; ediff-vers.el ends here