Re: master ae7fe26 1/3: ; Fix my previous commit

Re: master ae7fe26 1/3: ; Fix my previous commit

[Stefan Monnier]

>     * 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`.


        Stefan

Re: master ae7fe26 1/3: ; Fix my previous commit

[Stefan Kangas]

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.

Yes, that was my diagnosis as well.  I suppose one could argue that this
warning is a bug, but it hardly seems worth fixing: this use-case is not
something we should encourage.  So I installed the workaround.

> We should throw out `generic-extras-enable-list`.

Agreed.  I guess it only exists for historical reasons?

BTW, is there any reason why the modes in generic-x.el are not
autoloaded and in auto-mode-alist?  I did not know that (require
'generic-x) was a thing until today, and I do remember at times missing
the syntax highlighting of some of the files it supports.

Re: master ae7fe26 1/3: ; Fix my previous commit

[Stefan Monnier]

>> 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.
> Yes, that was my diagnosis as well.  I suppose one could argue that this
> warning is a bug,

It's definitely a limitation that occasionally gets in the way.

> BTW, is there any reason why the modes in generic-x.el are not
> autoloaded and in auto-mode-alist?  I did not know that (require
> 'generic-x) was a thing until today, and I do remember at times missing
> the syntax highlighting of some of the files it supports.

Probably because they're all pretty lame?
I think they should all be rewritten to use define-derived-mode and
generic.el should then be marked obsolete.  But this requires first
providing some way to set the comment syntax more-or-less as
conveniently as done with define-generic-mode.


        Stefan

Re: master ae7fe26 1/3: ; Fix my previous commit

[Stefan Kangas]

[-- Attachment #1: Type: text/plain, Size: 632 bytes --]

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?

[-- Attachment #2: 0001-Load-all-generic-x.el-modes-unconditionally.patch --]
[-- Type: text/x-diff, Size: 18140 bytes --]

From bf9c6a119ba4b41ffd9f5413684d534aaebd4c02 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Sat, 30 Jan 2021 01:30:45 +0100
Subject: [PATCH] Load all generic-x.el modes unconditionally

* lisp/generic-x.el: Load all modes unconditionally.
(generic-default-modes, generic-mswindows-modes)
(generic-unix-modes, generic-other-modes)
(generic-extras-enable-list): Make obsolete.
---
 etc/NEWS          |   4 ++
 lisp/generic-x.el | 163 +++++++++++++---------------------------------
 2 files changed, 48 insertions(+), 119 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 8e233f8f19..8497f9e58a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2051,6 +2051,10 @@ parameter.
 'previous-system-time-locale' have been removed, as they were created
 by mistake and were not useful to Lisp code.
 
+---
+** The user option `generic-extras-enable-list' is now obsolete.
+Setting it has no effect.
+
 ---
 ** The 'load-dangerous-libraries' variable is now obsolete.
 It was used to allow loading Lisp libraries compiled by XEmacs, a
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 4c6e118900..5c3c55265a 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -32,17 +32,6 @@
 ;;
 ;;   (require 'generic-x)
 ;;
-;; You can decide which modes to load by setting the variable
-;; `generic-extras-enable-list'.  Its default value is platform-
-;; specific.  The recommended way to set this variable is through
-;; customize:
-;;
-;;   M-x customize-option RET generic-extras-enable-list RET
-;;
-;; This lets you select generic modes from the list of available
-;; modes.  If you manually set `generic-extras-enable-list' in your
-;; .emacs, do it BEFORE loading generic-x with (require 'generic-x).
-;;
 ;; You can also send in new modes; if the file types are reasonably
 ;; common, we would like to install them.
 ;;
@@ -197,6 +186,7 @@ generic-default-modes
     show-tabs-generic-mode
     vrml-generic-mode)
   "List of generic modes that are defined by default.")
+(make-obsolete-variable 'generic-default-modes nil "28.1")
 
 (defconst generic-mswindows-modes
   '(bat-generic-mode
@@ -206,6 +196,7 @@ generic-mswindows-modes
     reg-generic-mode
     rul-generic-mode)
   "List of generic modes that are defined by default on MS-Windows.")
+(make-obsolete-variable 'generic-mswindows-modes nil "28.1")
 
 (defconst generic-unix-modes
   '(alias-generic-mode
@@ -227,6 +218,7 @@ generic-unix-modes
     x-resource-generic-mode
     xmodmap-generic-mode)
   "List of generic modes that are defined by default on Unix.")
+(make-obsolete-variable 'generic-unix-modes nil "28.1")
 
 (defconst generic-other-modes
   '(astap-generic-mode
@@ -234,6 +226,7 @@ generic-other-modes
     pkginfo-generic-mode
     spice-generic-mode)
   "List of generic modes that are not defined by default.")
+(make-obsolete-variable 'generic-other-modes nil "28.1")
 
 (defcustom generic-extras-enable-list
   (append generic-default-modes
@@ -262,10 +255,9 @@ generic-extras-enable-list
 	 (unless load-in-progress
 	   (load "generic-x")))
   :version "22.1")
+(make-obsolete-variable 'generic-extras-enable-list "no longer used." "28.1")
 
 ;;; Apache
-(when (memq 'apache-conf-generic-mode generic-extras-enable-list)
-
 (define-generic-mode apache-conf-generic-mode
   '(?#)
   nil
@@ -278,9 +270,7 @@ apache-conf-generic-mode
            '((nil "^\\([-A-Za-z0-9_]+\\)" 1)
              ("*Directories*" "^\\s-*<Directory\\s-*\\([^>]+\\)>" 1)
              ("*Locations*"   "^\\s-*<Location\\s-*\\([^>]+\\)>" 1)))))
-  "Generic mode for Apache or HTTPD configuration files."))
-
-(when (memq 'apache-log-generic-mode generic-extras-enable-list)
+  "Generic mode for Apache or HTTPD configuration files.")
 
 (define-generic-mode apache-log-generic-mode
   nil
@@ -291,11 +281,9 @@ apache-log-generic-mode
      (2 font-lock-variable-name-face)))
   '("access_log\\'")
   nil
-  "Generic mode for Apache log files."))
+  "Generic mode for Apache log files.")
 
 ;;; Samba
-(when (memq 'samba-generic-mode generic-extras-enable-list)
-
 (define-generic-mode samba-generic-mode
   '(?\; ?#)
   nil
@@ -305,13 +293,11 @@ samba-generic-mode
      (2 font-lock-type-face)))
   '("smb\\.conf\\'")
   '(generic-bracket-support)
-  "Generic mode for Samba configuration files."))
+  "Generic mode for Samba configuration files.")
 
 ;;; Fvwm
 ;; This is pretty basic. Also, modes for other window managers could
 ;; be defined as well.
-(when (memq 'fvwm-generic-mode generic-extras-enable-list)
-
 (define-generic-mode fvwm-generic-mode
   '(?#)
   '("AddToMenu"
@@ -330,33 +316,28 @@ fvwm-generic-mode
   nil
   '("\\.fvwmrc\\'" "\\.fvwm2rc\\'")
   nil
-  "Generic mode for FVWM configuration files."))
+  "Generic mode for FVWM configuration files.")
 
 ;;; X Resource
 ;; I'm pretty sure I've seen an actual mode to do this, but I don't
 ;; think it's standard with Emacs
-(when (memq 'x-resource-generic-mode generic-extras-enable-list)
-
 (define-generic-mode x-resource-generic-mode
   '(?!)
   nil
   '(("^\\([^:\n]+:\\)" 1 font-lock-variable-name-face))
   '("\\.Xdefaults\\'" "\\.Xresources\\'" "\\.Xenvironment\\'" "\\.ad\\'")
   nil
-  "Generic mode for X Resource configuration files."))
+  "Generic mode for X Resource configuration files.")
 
-(if (memq 'xmodmap-generic-mode generic-extras-enable-list)
 (define-generic-mode xmodmap-generic-mode
   '(?!)
   '("add" "clear" "keycode" "keysym" "remove" "pointer")
   nil
   '("[xX]modmap\\(rc\\)?\\'")
   nil
-  "Simple mode for xmodmap files."))
+  "Simple mode for xmodmap files.")
 
 ;;; Hosts
-(when (memq 'hosts-generic-mode generic-extras-enable-list)
-
 (define-generic-mode hosts-generic-mode
   '(?#)
   '("localhost")
@@ -364,27 +345,23 @@ hosts-generic-mode
     ("\\<\\([0-9A-Fa-f:]+\\)\\>" 1 font-lock-constant-face))
   '("[hH][oO][sS][tT][sS]\\'")
   nil
-  "Generic mode for HOSTS files."))
+  "Generic mode for HOSTS files.")
 
 ;;; Windows INF files
 
 ;; If i-g-m-f-f-h is defined, then so is i-g-m.
 (declare-function ini-generic-mode "generic-x")
 
-(when (memq 'inf-generic-mode generic-extras-enable-list)
-
 (define-generic-mode inf-generic-mode
   '(?\;)
   nil
   '(("^\\(\\[.*\\]\\)" 1 font-lock-constant-face))
   '("\\.[iI][nN][fF]\\'")
   '(generic-bracket-support)
-  "Generic mode for MS-Windows INF files."))
+  "Generic mode for MS-Windows INF files.")
 
 ;;; Windows INI files
 ;; Should define escape character as well!
-(when (memq 'ini-generic-mode generic-extras-enable-list)
-
 (define-generic-mode ini-generic-mode
   '(?\;)
   nil
@@ -412,12 +389,10 @@ ini-generic-mode-find-file-hook
 	 (and (looking-at "^\\s-*\\[.*\\]")
 	      (ini-generic-mode)))))
 (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")
 
 ;;; Windows REG files
 ;;; Unfortunately, Windows 95 and Windows NT have different REG file syntax!
-(when (memq 'reg-generic-mode generic-extras-enable-list)
-
 (define-generic-mode reg-generic-mode
   '(?\;)
   '("key" "classes_root" "REGEDIT" "REGEDIT4")
@@ -428,19 +403,16 @@ reg-generic-mode
    (lambda ()
      (setq imenu-generic-expression
            '((nil "^\\s-*\\(.*\\)\\s-*=" 1)))))
-  "Generic mode for MS-Windows Registry files."))
+  "Generic mode for MS-Windows Registry files.")
 
 (declare-function w32-shell-name "w32-fns" ())
 
 ;;; DOS/Windows BAT files
-(when (memq 'bat-generic-mode generic-extras-enable-list)
-  (define-obsolete-function-alias 'bat-generic-mode 'bat-mode "24.4"))
+(define-obsolete-function-alias 'bat-generic-mode #'bat-mode "24.4")
 
 ;;; Mailagent
 ;; Mailagent is a Unix mail filtering program.  Anyone wanna do a
 ;; generic mode for procmail?
-(when (memq 'mailagent-rules-generic-mode generic-extras-enable-list)
-
 (define-generic-mode mailagent-rules-generic-mode
   '(?#)
   '("SAVE" "DELETE" "PIPE" "ANNOTATE" "REJECT")
@@ -451,11 +423,9 @@ mailagent-rules-generic-mode
    (lambda ()
      (setq imenu-generic-expression
            '((nil "\\s-/\\([^/]+\\)/[i, \t\n]" 1)))))
-  "Generic mode for Mailagent rules files."))
+  "Generic mode for Mailagent rules files.")
 
 ;; Solaris/Sys V prototype files
-(when (memq 'prototype-generic-mode generic-extras-enable-list)
-
 (define-generic-mode prototype-generic-mode
   '(?#)
   nil
@@ -474,11 +444,9 @@ prototype-generic-mode
      (2 font-lock-variable-name-face)))
   '("prototype\\'")
   nil
-  "Generic mode for Sys V prototype files."))
+  "Generic mode for Sys V prototype files.")
 
 ;; Solaris/Sys V pkginfo files
-(when (memq 'pkginfo-generic-mode generic-extras-enable-list)
-
 (define-generic-mode pkginfo-generic-mode
   '(?#)
   nil
@@ -487,17 +455,14 @@ pkginfo-generic-mode
      (2 font-lock-variable-name-face)))
   '("pkginfo\\'")
   nil
-  "Generic mode for Sys V pkginfo files."))
+  "Generic mode for Sys V pkginfo files.")
 
 ;; Javascript mode
 ;; Obsolete; defer to js-mode from js.el.
-(when (memq 'javascript-generic-mode generic-extras-enable-list)
-  (define-obsolete-function-alias 'javascript-generic-mode 'js-mode "24.3")
-  (define-obsolete-variable-alias 'javascript-generic-mode-hook 'js-mode-hook "24.3"))
+(define-obsolete-function-alias 'javascript-generic-mode #'js-mode "24.3")
+(define-obsolete-variable-alias 'javascript-generic-mode-hook 'js-mode-hook "24.3")
 
 ;; VRML files
-(when (memq 'vrml-generic-mode generic-extras-enable-list)
-
 (define-generic-mode vrml-generic-mode
   '(?#)
   '("DEF"
@@ -545,11 +510,9 @@ vrml-generic-mode
              ("*Definitions*"
               "DEF\\s-+\\([-A-Za-z0-9_]+\\)\\s-+\\([A-Za-z0-9]+\\)\\s-*{"
               1)))))
-  "Generic Mode for VRML files."))
+  "Generic Mode for VRML files.")
 
 ;; Java Manifests
-(when (memq 'java-manifest-generic-mode generic-extras-enable-list)
-
 (define-generic-mode java-manifest-generic-mode
   '(?#)
   '("Name"
@@ -566,11 +529,9 @@ java-manifest-generic-mode
      (2 font-lock-constant-face)))
   '("[mM][aA][nN][iI][fF][eE][sS][tT]\\.[mM][fF]\\'")
   nil
-  "Generic mode for Java Manifest files."))
+  "Generic mode for Java Manifest files.")
 
 ;; Java properties files
-(when (memq 'java-properties-generic-mode generic-extras-enable-list)
-
 (define-generic-mode java-properties-generic-mode
   '(?! ?#)
   nil
@@ -596,11 +557,9 @@ java-properties-generic-mode
    (lambda ()
      (setq imenu-generic-expression
            '((nil "^\\([^#! \t\n\r=:]+\\)" 1)))))
-  "Generic mode for Java properties files."))
+  "Generic mode for Java properties files.")
 
 ;; C shell alias definitions
-(when (memq 'alias-generic-mode generic-extras-enable-list)
-
 (define-generic-mode alias-generic-mode
   '(?#)
   '("alias" "unalias")
@@ -613,11 +572,9 @@ alias-generic-mode
    (lambda ()
      (setq imenu-generic-expression
            '((nil "^\\(alias\\|unalias\\)\\s-+\\([-a-zA-Z0-9_]+\\)" 2)))))
-  "Generic mode for C Shell alias files."))
+  "Generic mode for C Shell alias files.")
 
 ;; Ansible inventory files
-(when (memq 'ansible-inventory-generic-mode generic-extras-enable-list)
-
 (define-generic-mode ansible-inventory-generic-mode
   '(?#)
   nil
@@ -636,12 +593,10 @@ ansible-inventory-generic-mode
      (setq imenu-generic-expression
            '((nil "^\\s-*\\[\\(.*\\)\\]" 1)
              ("*Variables*" "\\s-+\\([^ =\n\r]+\\)=" 1)))))
-  "Generic mode for Ansible inventory files."))
+  "Generic mode for Ansible inventory files.")
 
 ;;; Windows RC files
 ;; Contributed by ACorreir@pervasive-sw.com (Alfred Correira)
-(when (memq 'rc-generic-mode generic-extras-enable-list)
-
 (define-generic-mode rc-generic-mode
   ;; '(?\/)
   '("//")
@@ -721,15 +676,13 @@ rc-generic-mode
      '("^#[ \t]*\\(\\sw+\\)\\>[ \t]*\\(\\sw+\\)?"
        (1 font-lock-constant-face)
        (2 font-lock-variable-name-face nil t))))
-    '("\\.[rR][cC]\\'")
-    nil
-    "Generic mode for MS-Windows Resource files."))
+  '("\\.[rR][cC]\\'")
+  nil
+  "Generic mode for MS-Windows Resource files.")
 
 ;; InstallShield RUL files
 ;; Contributed by  Alfred.Correira@Pervasive.Com
 ;; Bugfixes by "Rolf Sandau" <Rolf.Sandau@marconi.com>
-(when (memq 'rul-generic-mode generic-extras-enable-list)
-
 (eval-when-compile
 
 ;;; build the regexp strings using regexp-opt
@@ -1372,11 +1325,9 @@ rul-function
   > "begin" \n
   > _ \n
   resume:
-  > "end;"))
+  > "end;")
 
 ;; Additions by ACorreir@pervasive-sw.com (Alfred Correira)
-(when (memq 'mailrc-generic-mode generic-extras-enable-list)
-
 (define-generic-mode mailrc-generic-mode
   '(?#)
   '("alias"
@@ -1398,11 +1349,9 @@ mailrc-generic-mode
      (2 font-lock-variable-name-face)))
   '("\\.mailrc\\'")
   nil
-  "Mode for mailrc files."))
+  "Mode for mailrc files.")
 
 ;; Inetd.conf
-(when (memq 'inetd-conf-generic-mode generic-extras-enable-list)
-
 (define-generic-mode inetd-conf-generic-mode
   '(?#)
   '("stream"
@@ -1417,11 +1366,9 @@ inetd-conf-generic-mode
   (list
    (lambda ()
      (setq imenu-generic-expression
-           '((nil "^\\([-A-Za-z0-9_]+\\)" 1)))))))
+           '((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))
 
 ;; Services
-(when (memq 'etc-services-generic-mode generic-extras-enable-list)
-
 (define-generic-mode etc-services-generic-mode
   '(?#)
   '("tcp"
@@ -1434,11 +1381,9 @@ etc-services-generic-mode
   (list
    (lambda ()
      (setq imenu-generic-expression
-           '((nil "^\\([-A-Za-z0-9_]+\\)" 1)))))))
+           '((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))
 
 ;; Password and Group files
-(when (memq 'etc-passwd-generic-mode generic-extras-enable-list)
-
 (define-generic-mode etc-passwd-generic-mode
   nil              ;; No comment characters
   '("root")        ;; Only one keyword
@@ -1476,11 +1421,9 @@ etc-passwd-generic-mode
   (list
    (lambda ()
      (setq imenu-generic-expression
-           '((nil "^\\([-A-Za-z0-9_]+\\):" 1)))))))
+           '((nil "^\\([-A-Za-z0-9_]+\\):" 1))))))
 
 ;; Fstab
-(when (memq 'etc-fstab-generic-mode generic-extras-enable-list)
-
 (define-generic-mode etc-fstab-generic-mode
   '(?#)
   '("adfs"
@@ -1592,11 +1535,9 @@ etc-fstab-generic-mode
   (list
    (lambda ()
      (setq imenu-generic-expression
-           '((nil "^\\([^# \t]+\\)\\s-+" 1)))))))
+           '((nil "^\\([^# \t]+\\)\\s-+" 1))))))
 
 ;; /etc/sudoers
-(when (memq 'etc-sudoers-generic-mode generic-extras-enable-list)
-
 (define-generic-mode etc-sudoers-generic-mode
   '(?#)
   '("User_Alias" "Runas_Alias" "Host_Alias"  "Cmnd_Alias"
@@ -1607,11 +1548,9 @@ etc-sudoers-generic-mode
     ("\\<\\(%[A-Za-z0-9_]+\\)\\>" 1 font-lock-variable-name-face))
   '("/etc/sudoers\\'")
   nil
-  "Generic mode for sudoers configuration files."))
+  "Generic mode for sudoers configuration files.")
 
 ;; From Jacques Duthen <jacques.duthen@sncf.fr>
-(when (memq 'show-tabs-generic-mode generic-extras-enable-list)
-
 (eval-when-compile
 
 (defconst show-tabs-generic-mode-font-lock-defaults-1
@@ -1649,14 +1588,12 @@ show-tabs-generic-mode
   nil ;; no auto-mode-alist
   ;; '(show-tabs-generic-mode-hook-fun)
   nil
-  "Generic mode to show tabs and trailing spaces."))
+  "Generic mode to show tabs and trailing spaces.")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; DNS modes
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(when (memq 'named-boot-generic-mode generic-extras-enable-list)
-
 (define-generic-mode named-boot-generic-mode
   ;; List of comment characters
   '(?\;)
@@ -1672,9 +1609,7 @@ named-boot-generic-mode
   ;; List of additional automode-alist expressions
   '("/etc/named\\.boot\\'")
   ;; List of set up functions to call
-  nil))
-
-(when (memq 'named-database-generic-mode generic-extras-enable-list)
+  nil)
 
 (define-generic-mode named-database-generic-mode
   ;; List of comment characters
@@ -1695,9 +1630,7 @@ named-database-time-string
 (defun named-database-print-serial ()
   "Print a serial number based on the current date."
   (interactive)
-  (insert (format-time-string named-database-time-string))))
-
-(when (memq 'resolve-conf-generic-mode generic-extras-enable-list)
+  (insert (format-time-string named-database-time-string)))
 
 (define-generic-mode resolve-conf-generic-mode
   ;; List of comment characters
@@ -1709,14 +1642,12 @@ resolve-conf-generic-mode
   ;; List of additional auto-mode-alist expressions
   '("/etc/resolve?\\.conf\\'")
   ;; List of set up functions to call
-  nil))
+  nil)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Modes for spice and common electrical engineering circuit netlist formats
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(when (memq 'spice-generic-mode generic-extras-enable-list)
-
 (define-generic-mode spice-generic-mode
   nil
   '("and"
@@ -1752,9 +1683,7 @@ spice-generic-mode
    ;; Make keywords case-insensitive
    (lambda ()
      (setq font-lock-defaults '(generic-font-lock-keywords nil t))))
-  "Generic mode for SPICE circuit netlist files."))
-
-(when (memq 'ibis-generic-mode generic-extras-enable-list)
+  "Generic mode for SPICE circuit netlist files.")
 
 (define-generic-mode ibis-generic-mode
   '(?|)
@@ -1763,9 +1692,7 @@ ibis-generic-mode
     ("\\(\\(_\\|\\w\\)+\\)\\s-*=" 1 font-lock-variable-name-face))
   '("\\.[iI][bB][sS]\\'")
   '(generic-bracket-support)
-  "Generic mode for IBIS circuit netlist files."))
-
-(when (memq 'astap-generic-mode generic-extras-enable-list)
+  "Generic mode for IBIS circuit netlist files.")
 
 (define-generic-mode astap-generic-mode
   nil
@@ -1799,9 +1726,7 @@ astap-generic-mode
    ;; Make keywords case-insensitive
    (lambda ()
      (setq font-lock-defaults '(generic-font-lock-keywords nil t))))
-  "Generic mode for ASTAP circuit netlist files."))
-
-(when (memq 'etc-modules-conf-generic-mode generic-extras-enable-list)
+  "Generic mode for ASTAP circuit netlist files.")
 
 (define-generic-mode etc-modules-conf-generic-mode
   ;; List of comment characters
@@ -1843,7 +1768,7 @@ etc-modules-conf-generic-mode
   ;; List of additional automode-alist expressions
   '("/etc/modules\\.conf" "/etc/conf\\.modules")
   ;; List of set up functions to call
-  nil))
+  nil)
 
 (provide 'generic-x)
 
-- 
2.29.2