3 files changed, 7 insertions, 16 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 845c666bc8b..3669101d3ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/edebug.el (edebug-read-function): Remove old incorrect
+        mapping from #' to function*.
+
 2012-06-13  Chong Yidong  <cyd@gnu.org>
 
         * mouse.el (mouse-drag-track): Do not set the mark if the user
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index f0554342a09..b389e78bc39 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -254,18 +254,6 @@ Remove from SYMBOL's plist the property PROPNAME and its value.
 
 ;;;***
 
-<<<<<<< TREE
-;;;### (autoloads (defsubst* compiler-macroexpand define-compiler-macro
-;;;;;;  assert check-type typep deftype cl-struct-setf-expander defstruct
-;;;;;;  define-modify-macro callf2 callf letf* letf rotatef shiftf
-;;;;;;  remf cl-do-pop psetf setf get-setf-method defsetf define-setf-method
-;;;;;;  declare the locally multiple-value-setq multiple-value-bind
-;;;;;;  lexical-let* lexical-let symbol-macrolet macrolet labels
-;;;;;;  flet progv psetq do-all-symbols do-symbols dotimes dolist
-;;;;;;  do* do loop return-from return block etypecase typecase ecase
-;;;;;;  case load-time-value eval-when destructuring-bind function*
-;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "d19555cbac873fe90a312b8977a8ebff")
-=======
 ;;;### (autoloads (cl--compiler-macro-cXXr cl--compiler-macro-list*
 ;;;;;;  cl--compiler-macro-adjoin cl-defsubst cl-compiler-macroexpand
 ;;;;;;  cl-define-compiler-macro cl-assert cl-check-type cl-typep
@@ -279,8 +267,7 @@ Remove from SYMBOL's plist the property PROPNAME and its value.
 ;;;;;;  cl-return cl-block cl-etypecase cl-typecase cl-ecase cl-case
 ;;;;;;  cl-load-time-value cl-eval-when cl-destructuring-bind cl-function
 ;;;;;;  cl-defmacro cl-defun cl-gentemp cl-gensym) "cl-macs" "cl-macs.el"
-;;;;;;  "32abce1bd6f38339285a6071e1be5e59")
->>>>>>> MERGE-SOURCE
+;;;;;;  "4a758f183747246fe042bf42b6ddd85c")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'cl-gensym "cl-macs" "\
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 28b768a14b3..c1c65b6f661 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -919,8 +919,7 @@ already is one.)"
   (cond ((eq ?\' (following-char))
          (forward-char 1)
          (list
-          (edebug-storing-offsets (- (point) 2)
-            (if (featurep 'cl) 'function* 'function))
+          (edebug-storing-offsets (- (point) 2) 'function)
           (edebug-read-storing-offsets stream)))
         ((memq (following-char) '(?: ?B ?O ?X ?b ?o ?x ?1 ?2 ?3 ?4 ?5 ?6
                                   ?7 ?8 ?9 ?0))