From 2b95300cf8e3da9f505233f116cabe39a3564fa7 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 4 Sep 2020 08:46:45 -0400 Subject: [PATCH] * 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. --- lisp/cus-dep.el | 2 +- lisp/display-fill-column-indicator.el | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el index fd307a5c04e..e2fd7febd2f 100644 --- 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 3f947bdc1c9..3391aa371b7 100644 --- 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) -- 2.39.5