diff options
author | Miles Bader <miles@gnu.org> | 2005-08-05 10:57:36 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2005-08-05 10:57:36 +0000 |
commit | 5e10f34207ff594cd6570928bc0292a7b53297b8 (patch) | |
tree | d03b31da4d83d4a49fac3162e5481b77849754d5 /lisp/emacs-lisp/cl-extra.el | |
parent | 07bd7822113da5ae28d0db471453622a2ed5d6cd (diff) | |
parent | 11e22c4a01e2535ad784e0d122a65837a13ec71c (diff) | |
download | emacs-5e10f34207ff594cd6570928bc0292a7b53297b8.tar.gz emacs-5e10f34207ff594cd6570928bc0292a7b53297b8.tar.bz2 emacs-5e10f34207ff594cd6570928bc0292a7b53297b8.zip |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-77
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 504-513)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: .cvsignore: Add `lock'.
* gnus--rel--5.10 (patch 99-103)
- Update from CVS
Diffstat (limited to 'lisp/emacs-lisp/cl-extra.el')
-rw-r--r-- | lisp/emacs-lisp/cl-extra.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el index 107f8b1b223..16e777ed2b5 100644 --- a/lisp/emacs-lisp/cl-extra.el +++ b/lisp/emacs-lisp/cl-extra.el @@ -1,6 +1,6 @@ ;;; cl-extra.el --- Common Lisp features, part 2 -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993,2000,2003 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2000, 2003, 2005 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Keywords: extensions @@ -38,9 +38,7 @@ ;;; Code: -(or (memq 'cl-19 features) - (error "Tried to load `cl-extra' before `cl'!")) - +(require 'cl) ;;; Type coercion. @@ -763,5 +761,5 @@ This also does some trivial optimizations to make the form prettier." (run-hooks 'cl-extra-load-hook) -;;; arch-tag: bcd03437-0871-43fb-a8f1-ad0e0b5427ed +;; arch-tag: bcd03437-0871-43fb-a8f1-ad0e0b5427ed ;;; cl-extra.el ends here |