aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-08-22 14:33:55 +0000
committerChong Yidong2009-08-22 14:33:55 +0000
commitf88099c0e054dcf58415313e186b664b49f17121 (patch)
tree39c81bc039dc0206813181decf0b0139f5892002
parent33efc0891770e6f0c0a041606a0f740e27a93789 (diff)
downloademacs-f88099c0e054dcf58415313e186b664b49f17121.tar.gz
emacs-f88099c0e054dcf58415313e186b664b49f17121.zip
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.
-rw-r--r--lisp/eieio/eieio.el9
1 files changed, 0 insertions, 9 deletions
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 @@
45(defvar eieio-version "1.2" 45(defvar eieio-version "1.2"
46 "Current version of EIEIO.") 46 "Current version of EIEIO.")
47 47
48(when (featurep 'eieio)
49 (error "Do not load EIEIO twice."))
50
51(eval-when-compile
52 (when (featurep 'eieio)
53 (error "Do not byte-compile EIEIO if EIEIO is already loaded.")))
54
55(require 'cl) 48(require 'cl)
56;;(load "cl-macs" nil t) ; No provide in this file.
57 49
58;;; Code:
59(defun eieio-version () 50(defun eieio-version ()
60 "Display the current version of EIEIO." 51 "Display the current version of EIEIO."
61 (interactive) 52 (interactive)