* lisp/emacs-lisp/cl-lib.el: Rename from cl.el.

* lisp/emacs-lisp/cl.el: New compatibility file.
* emacs-lisp/cl-lib.el, lisp/emacs-lisp/cl-seq.el, lisp/emacs-lisp/cl-macs.el:
* lisp/emacs-lisp/cl-extra.el: Rename all top-level functions and variables
to obey the "cl-" prefix.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Adjust to new name.

etc/NEWS

@@ -119,6 +119,18 @@ character when doing minibuffer filename prompts.
 
 * Changes in Specialized Modes and Packages in Emacs 24.2
 
+** CL's main entry is now (require 'cl-lib).
+`cl-lib' is like the old `cl' except that it uses the namespace cleanly,
+i.e. all its definitions have the "cl-" prefix.
+
+If `cl' provided a feature under the name `foo', then `cl-lib' provides it
+under the name `cl-foo' instead, with the exceptions of the few definitions
+that had to use `foo*' to avoid conflicts with pre-existing Elisp entities,
+which have not been renamed to `cl-foo*' but just `cl-foo'.
+
+The old `cl' is now deprecated and is nothing more than a bunch of aliases that
+provide the old non-prefixed names.
+
 ** VHDL-mode
 - Support for ghdl (free vhdl compiler).  Now default.
 - Add/update support for VHDL-AMS packages.

lisp/ChangeLog

+2012-06-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/cl-lib.el: Rename from cl.el.
+	* emacs-lisp/cl.el: New compatibility file.
+	* emacs-lisp/cl-lib.el, emacs-lisp/cl-seq.el, emacs-lisp/cl-macs.el:
+	* emacs-lisp/cl-extra.el: Rename all top-level functions and variables
+	to obey the "cl-" prefix.
+	* emacs-lisp/macroexp.el (macroexpand-all-1): Adjust to new name.
+
 2012-06-03  Glenn Morris  <rgm@gnu.org>
 	* emacs-lisp/authors.el (authors-aliases): Addition.
@@ -18,14 +27,14 @@
 2012-06-03  Chong Yidong  <cyd@gnu.org>
 	* progmodes/compile.el (compilation-mode-line-fail)
-	(compilation-mode-line-run, compilation-mode-line-exit): New
-	faces.
+	(compilation-mode-line-run, compilation-mode-line-exit):
+	New faces.
 	(compilation-start, compilation-handle-exit): Use them (Bug#11032).
 2012-06-03  Jack Duthen  <duthen.mac.01@gmail.com>  (tiny change)
-	* progmodes/which-func.el (which-func-update-ediff-windows): New
-	function.  Use it in ediff-select-hook (Bug#11478).
+	* progmodes/which-func.el (which-func-update-ediff-windows):
+	New function.  Use it in ediff-select-hook (Bug#11478).
 2012-06-03  Chong Yidong  <cyd@gnu.org>

lisp/emacs-lisp/macroexp.el

@@ -185,9 +185,9 @@ Assumes the caller has bound `macroexpand-all-environment'."
                   (and (symbolp fun)
                        (eq (get fun 'byte-compile)
                            'cl-byte-compile-compiler-macro)
-                       (functionp 'compiler-macroexpand))))
+                       (functionp 'cl-compiler-macroexpand))))
          . ,_)
-       (let ((newform (with-no-warnings (compiler-macroexpand form))))
+       (let ((newform (with-no-warnings (cl-compiler-macroexpand form))))
          (if (eq form newform)
              (macroexpand-all-forms form 1)
            (macroexpand-all-1 newform))))