* lisp/emacs-lisp/advice.el (ad-definition-type): Make sure we don't use

a preactivated advice from an old advice.el; they're not compatible!

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dccdc429ebce0164e28bb93f1097d82110b72f51..b86e03b42af74f06d2b670c06ccb4818f7862e3e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/advice.el (ad-definition-type): Make sure we don't use
+       a preactivated advice from an old advice.el; they're not compatible!
+
 2012-11-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * emacs-lisp/nadvice.el (advice--make-interactive-form):

diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index b99e614bec50f6dbab197c6c545a60658f771f11..60c1a846a79cf5f36c3c836107f1f4efef4a0f6d 100644 (file)
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -2239,16 +2239,15 @@ definition (see the code for `documentation')."
 
 (defun ad-definition-type (definition)
   "Return symbol that describes the type of DEFINITION."
+  ;; These symbols are only ever used to check a cache entry's validity.
+  ;; The suffix `2' reflects the fact that we're using version 2 of advice
+  ;; representations, so cache entries preactivated with version
+  ;; 1 can't be used.
   (cond
-   ((ad-macro-p definition) 'macro)
-   ((ad-subr-p definition)
-    (if (special-form-p definition)
-        'special-form
-      'subr))
-   ((or (ad-lambda-p definition)
-        (ad-compiled-p definition))
-    'function)
-   ((ad-advice-p definition) 'advice)))
+   ((ad-macro-p definition) 'macro2)
+   ((ad-subr-p definition) 'subr2)
+   ((or (ad-lambda-p definition) (ad-compiled-p definition)) 'fun2)
+   ((ad-advice-p definition) 'advice2))) ;; FIXME: Can this ever happen?
 
 (defun ad-has-proper-definition (function)
   "True if FUNCTION is a symbol with a proper definition.