Merge from emacs-23

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

diff --git a/lisp/ediff-init.el b/lisp/vc/ediff-init.el
similarity index 99%
rename from lisp/ediff-init.el
rename to lisp/vc/ediff-init.el
index 06a29b84997dcb91e012244afcf60c7b735c137a..56ccc540352928cc006099fcfaffa0934e85a3ac 100644 (file)
--- a/lisp/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -4,6 +4,7 @@
 ;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
 
 ;; This file is part of GNU Emacs.
 
@@ -786,16 +787,6 @@ TYPE-OF-EMACS is either 'xemacs or 'emacs."
   "")
 
 
-(if (ediff-has-face-support-p)
-    (if (featurep 'xemacs)
-       (progn
-         (defalias 'ediff-valid-color-p 'valid-color-name-p)
-         (defalias 'ediff-get-face 'get-face))
-      (defalias 'ediff-valid-color-p (if (fboundp 'color-defined-p)
-                                        'color-defined-p
-                                      'x-color-defined-p))
-      (defalias 'ediff-get-face 'internal-get-face)))
-
 (if (ediff-window-display-p)
     (if (featurep 'xemacs)
        (progn