# HG changeset patch # User Chong Yidong # Date 1250951635 0 # Node ID 5df6945a3eaa0d611f2490ae0d97fab2167c143f # Parent 2efe3dc24373bb8b2411392e96583ead378a5b59 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 -r 2efe3dc24373 -r 5df6945a3eaa lisp/eieio/eieio.el --- 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)