* lisp/display-fill-column-indicator.el: Fix bug#41145

(global-display-fill-column-indicator-mode): Specify the implicit
defustom's group explicitly.

* lisp/cus-dep.el (custom-make-dependencies): Also look at
define(-globalized)-minor-mode since it can also define custom vars.

diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index fd307a5c04e658236178c08ab3ebb921c3193c62..e2fd7febd2f6ec93fb8340b52c39a617f6ccf70b 100644 (file)
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -99,7 +99,7 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
                   (setq name (intern name)))
               (condition-case nil
                   (while (re-search-forward
-                          "^(def\\(custom\\|face\\|group\\)" nil t)
+                          "^(def\\(custom\\|face\\|group\\|ine\\(?:-globalized\\)?-minor-mode\\)" nil t)
                     (beginning-of-line)
                     (let ((type (match-string 1))
                          (expr (read (current-buffer))))

diff --git a/lisp/display-fill-column-indicator.el b/lisp/display-fill-column-indicator.el
index 3f947bdc1c9c7639f0a0f72109009ff842e55bce..3391aa371b707f0edaad9d3aaa9fe54af3a56a03 100644 (file)
--- a/lisp/display-fill-column-indicator.el
+++ b/lisp/display-fill-column-indicator.el
@@ -73,7 +73,9 @@ See Info node `Displaying Boundaries' for details."
 
 ;;;###autoload
 (define-globalized-minor-mode global-display-fill-column-indicator-mode
-  display-fill-column-indicator-mode display-fill-column-indicator--turn-on)
+  display-fill-column-indicator-mode display-fill-column-indicator--turn-on
+  ;; See bug#41145
+  :group 'display-fill-column-indicator)
 
 (provide 'display-fill-column-indicator)