mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-04-04 21:32:22 -07:00
Merge branch 'master' into feature/igc
This commit is contained in:
commit
c19d702b3b
146 changed files with 2274 additions and 1059 deletions
|
|
@ -988,7 +988,7 @@ defalias (Lisp_Object symbol, Lisp_Object definition)
|
|||
{ /* Handle automatic advice activation. */
|
||||
Lisp_Object hook = Fget (symbol, Qdefalias_fset_function);
|
||||
if (!NILP (hook))
|
||||
call2 (hook, symbol, definition);
|
||||
calln (hook, symbol, definition);
|
||||
else
|
||||
Ffset (symbol, definition);
|
||||
}
|
||||
|
|
@ -1209,7 +1209,7 @@ Value, if non-nil, is a list (interactive SPEC). */)
|
|||
if (genfun
|
||||
/* Avoid burping during bootstrap. */
|
||||
&& !NILP (Fsymbol_function (Qoclosure_interactive_form)))
|
||||
return call1 (Qoclosure_interactive_form, fun);
|
||||
return calln (Qoclosure_interactive_form, fun);
|
||||
else
|
||||
return Qnil;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue