From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 22 Aug 2009 14:33:55 +0000 (+0000)
Subject: Remove statement preventing it from being loaded twice.
X-Git-Tag: emacs-pretest-23.1.90~1091^2~118
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f88099c0e054dcf58415313e186b664b49f17121;p=emacs.git

Remove statement preventing it from being loaded twice.
Remove statement preventing it from being byte-compiled if loaded.
Remove `(load "cl-macs" nil t)' statement: the functions in
  cl-macs are autoloaded by cl.
---

diff --git a/lisp/eieio/eieio.el b/lisp/eieio/eieio.el
index b68e911f066..6931d992188 100644
--- a/lisp/eieio/eieio.el
+++ b/lisp/eieio/eieio.el
@@ -45,17 +45,8 @@
 (defvar eieio-version "1.2"
   "Current version of EIEIO.")
 
-(when (featurep 'eieio)
-  (error "Do not load EIEIO twice."))
-
-(eval-when-compile
-  (when (featurep 'eieio)
-    (error "Do not byte-compile EIEIO if EIEIO is already loaded.")))
-
 (require 'cl)
-;;(load "cl-macs" nil t) ; No provide in this file.
 
-;;; Code:
 (defun eieio-version ()
   "Display the current version of EIEIO."
   (interactive)