diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-06-13 11:46:29 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-06-13 11:46:29 -0400 |
| commit | a81068ba9604f9c420491ff1e3b75b014e18c25d (patch) | |
| tree | d20256419682622102526d9f26eca8de78e7c085 /lisp | |
| parent | 8cca97031d60136b3bdebef0d978ee3fe40eddec (diff) | |
| download | emacs-a81068ba9604f9c420491ff1e3b75b014e18c25d.tar.gz emacs-a81068ba9604f9c420491ff1e3b75b014e18c25d.tar.bz2 emacs-a81068ba9604f9c420491ff1e3b75b014e18c25d.zip | |
* lisp/emacs-lisp/edebug.el (edebug-read-function): Remove old incorrect
mapping from #' to function*.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 3 |
2 files changed, 6 insertions, 2 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/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)) |