diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-08-04 22:57:13 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-08-04 22:57:13 +0000 |
| commit | 5c6f8807ce09c17e1a2161856f560073dd28ac30 (patch) | |
| tree | 0ca9a44416ad5f9c5834018468f71712cbb7edbf /src/data.c | |
| parent | ff7e5734e073bce0081ca3a977ea125ea59de882 (diff) | |
| download | emacs-5c6f8807ce09c17e1a2161856f560073dd28ac30.tar.gz | |
(Fdefine_function, Fdefalias): Handle advice as in Ffset.
(Qad_advice_info): Lisp and C names renamed from Qadvice_info.
(Qad_activate): C name renamed from Qactivate_advice.
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/data.c b/src/data.c index e00ab4dc5f8..b0959a92e55 100644 --- a/src/data.c +++ b/src/data.c @@ -74,7 +74,7 @@ Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp; Lisp_Object Qbuffer_or_string_p; Lisp_Object Qboundp, Qfboundp; Lisp_Object Qcdr; -Lisp_Object Qadvice_info, Qactivate_advice; +Lisp_Object Qad_advice_info, Qad_activate; Lisp_Object Qrange_error, Qdomain_error, Qsingularity_error; Lisp_Object Qoverflow_error, Qunderflow_error; @@ -556,9 +556,9 @@ DEFUN ("fset", Ffset, Sfset, 2, 2, 0, Vautoload_queue); XSYMBOL (sym)->function = newdef; /* Handle automatic advice activation */ - if (CONSP (XSYMBOL (sym)->plist) && !NILP (Fget (sym, Qadvice_info))) + if (CONSP (XSYMBOL (sym)->plist) && !NILP (Fget (sym, Qad_advice_info))) { - call2 (Qactivate_advice, sym, Fbyte_code_function_p (newdef)); + call2 (Qad_activate, sym, Qnil); newdef = XSYMBOL (sym)->function; } return newdef; @@ -577,6 +577,12 @@ Associates the function with the current load file, if any.") Vautoload_queue = Fcons (Fcons (sym, XSYMBOL (sym)->function), Vautoload_queue); XSYMBOL (sym)->function = newdef; + /* Handle automatic advice activation */ + if (CONSP (XSYMBOL (sym)->plist) && !NILP (Fget (sym, Qad_advice_info))) + { + call2 (Qad_activate, sym, Qnil); + newdef = XSYMBOL (sym)->function; + } LOADHIST_ATTACH (sym); return newdef; } @@ -592,6 +598,12 @@ Associates the function with the current load file, if any.") Vautoload_queue = Fcons (Fcons (sym, XSYMBOL (sym)->function), Vautoload_queue); XSYMBOL (sym)->function = newdef; + /* Handle automatic advice activation */ + if (CONSP (XSYMBOL (sym)->plist) && !NILP (Fget (sym, Qad_advice_info))) + { + call2 (Qad_activate, sym, Qnil); + newdef = XSYMBOL (sym)->function; + } LOADHIST_ATTACH (sym); return newdef; } @@ -2058,8 +2070,8 @@ syms_of_data () Qcdr = intern ("cdr"); /* Handle automatic advice activation */ - Qadvice_info = intern ("advice-info"); - Qactivate_advice = intern ("ad-activate"); + Qad_advice_info = intern ("ad-advice-info"); + Qad_activate = intern ("ad-activate"); error_tail = Fcons (Qerror, Qnil); @@ -2243,8 +2255,8 @@ syms_of_data () staticpro (&Qboundp); staticpro (&Qfboundp); staticpro (&Qcdr); - staticpro (&Qadvice_info); - staticpro (&Qactivate_advice); + staticpro (&Qad_advice_info); + staticpro (&Qad_activate); defsubr (&Seq); defsubr (&Snull); |