From: Lars Ingebrigtsen Date: Sun, 14 Feb 2021 12:57:59 +0000 (+0100) Subject: Revert the bit about command_modes in previous patch set X-Git-Tag: emacs-28.0.90~3749 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8cdb61679e169a68829a3122d4eda7139199f7ee;p=emacs.git Revert the bit about command_modes in previous patch set * src/data.c (Fcommand_modes): Remove the subr bit -- it's not necessary since it can just use a predicate. * src/lisp.h (GCALIGNED_STRUCT): Remove command_modes. * src/lread.c (defsubr): Remove command_modes. --- diff --git a/src/data.c b/src/data.c index 7bddc039f6f..ace859d2d0c 100644 --- a/src/data.c +++ b/src/data.c @@ -961,12 +961,7 @@ The value, if non-nil, is a list of mode name symbols. */) while (SYMBOLP (fun)) fun = Fsymbol_function (fun); - if (SUBRP (fun)) - { - if (!NILP (XSUBR (fun)->command_modes)) - return XSUBR (fun)->command_modes; - } - else if (COMPILEDP (fun)) + if (COMPILEDP (fun)) { Lisp_Object form = AREF (fun, COMPILED_INTERACTIVE); if (VECTORP (form)) diff --git a/src/lisp.h b/src/lisp.h index 697dd89363c..b95f389b890 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2060,7 +2060,6 @@ struct Lisp_Subr const char *symbol_name; const char *intspec; EMACS_INT doc; - Lisp_Object command_modes; } GCALIGNED_STRUCT; union Aligned_Lisp_Subr { diff --git a/src/lread.c b/src/lread.c index 8b8ba93c607..dea1b232fff 100644 --- a/src/lread.c +++ b/src/lread.c @@ -4467,7 +4467,6 @@ defsubr (union Aligned_Lisp_Subr *aname) XSETPVECTYPE (sname, PVEC_SUBR); XSETSUBR (tem, sname); set_symbol_function (sym, tem); - sname->command_modes = Qnil; } #ifdef NOTDEF /* Use fset in subr.el now! */