Mercurial > emacs

changeset 104402:5df6945a3eaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 22 Aug 2009 14:33:55 +0000
parents 2efe3dc24373
children 43a04bf4b4a8
files lisp/eieio/eieio.el
diffstat 1 files changed, 1 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/eieio/eieio.el	Sat Aug 22 04:12:52 2009 +0000
+++ b/lisp/eieio/eieio.el	Sat Aug 22 14:33:55 2009 +0000
@@ -45,17 +45,8 @@
 (defvar eieio-version "1.2"
   "Current version of EIEIO.")
 
-(when (featurep 'eieio)
-  (error "Do not load EIEIO twice."))
+(require 'cl)
 
-(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)