Stefan Monnier <monnier@iro.umontreal.ca> writes:

>>     * lisp/generic-x.el (generic-mode-ini-file-find-file-hook): Fix my
>>     previous commit; for some reason 'function' produces a warning here
>>     while 'quote' does not.
> [...]
>>  (define-obsolete-function-alias 'generic-mode-ini-file-find-file-hook
>> -  #'ini-generic-mode-find-file-hook "28.1"))
>> +  'ini-generic-mode-find-file-hook "28.1"))
>
> The problem is that most of the `defun`s in this file are not at top
> level but inside a `when`.  This is ugly and should be fixed.
>
> We should throw out `generic-extras-enable-list`.

How about the attached patch?