Move generic-x configuration to use-package

That package is unusual in that it requires… requiring it, in order
to activate its settings.  So it's a good candidate for use-package's
:demand t.

It's also a good candidate because something changed in Emacs's Lisp
pretty-printing code, and now customizing anything changes how this
variable is serialized, generating a spurious diff.  Can't wait to
have completely moved away from that auto-generated form.

2 files changed, 14 insertions, 2 deletions

diff --git a/.emacs b/.emacs
index 93a1a47..a53b1b2 100644
--- a/.emacs
+++ b/.emacs
@@ -734,6 +734,20 @@
    (my/list-update erc-track-exclude-types
      '("JOIN" "PART" "QUIT"))))
 
+(use-package generic-x
+  :demand t
+  :custom
+  (generic-extras-enable-list
+   '(etc-fstab-generic-mode
+     etc-modules-conf-generic-mode
+     etc-passwd-generic-mode
+     etc-services-generic-mode
+     etc-sudoers-generic-mode
+     hosts-generic-mode
+     pkginfo-generic-mode
+     resolve-conf-generic-mode
+     x-resource-generic-mode)))
+
 (use-package isearch
   :delight "🔍"
   :custom
diff --git a/.emacs-custom.el b/.emacs-custom.el
index 2cde161..d1324d0 100644
--- a/.emacs-custom.el
+++ b/.emacs-custom.el
@@ -24,8 +24,6 @@
  '(footnote-section-tag "")
  '(frame-resize-pixelwise t)
  '(gdb-many-windows t)
- '(generic-extras-enable-list
-   '(ansible-inventory-generic-mode etc-fstab-generic-mode etc-modules-conf-generic-mode etc-passwd-generic-mode etc-services-generic-mode etc-sudoers-generic-mode hosts-generic-mode java-manifest-generic-mode java-properties-generic-mode pkginfo-generic-mode prototype-generic-mode resolve-conf-generic-mode x-resource-generic-mode xmodmap-generic-mode))
  '(global-page-break-lines-mode t nil (page-break-lines))
  '(gnus-cloud-method "nnimap:gmail")
  '(highlight-nonselected-windows t)