Merge changes from emacs-23 branch

[gnu-emacs] / lisp / vc / ediff-mult.el

diff --git a/lisp/ediff-mult.el b/lisp/vc/ediff-mult.el
similarity index 99%
rename from lisp/ediff-mult.el
rename to lisp/vc/ediff-mult.el
index f9ff78977cc4c26d8add9702c7fa0fd2a9968d0d..cadcdec29b4f82c13b3bf8dcb79ad6b22c9f7fce 100644 (file)
--- a/lisp/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -1,9 +1,9 @@
 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2011 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
 
 ;; This file is part of GNU Emacs.
 
@@ -457,6 +457,7 @@ It is entered through one of the following commands:
 
 Commands:
 \\{ediff-meta-buffer-map}"
+  ;; FIXME: Use define-derived-mode.
   (kill-all-local-variables)
   (setq major-mode 'ediff-meta-mode)
   (setq mode-name "MetaEdiff")
@@ -2472,5 +2473,4 @@ for operation, or simply indicate which are equal files.  If it is nil, then
 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
 ;; End:
 
-;; arch-tag: c8a76898-f96f-4d9c-be9d-129134017188
 ;;; ediff-mult.el ends here