diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-09-09 07:51:14 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-09-09 07:51:14 -0700 |
| commit | 482fa0d9ed3d1b5ef6b95e908b5684a1f24cef4a (patch) | |
| tree | 3734bdc916a9895eed4dfbe2fbc05bb2597f38d4 /lisp/cus-dep.el | |
| parent | a5cc0242ebe174152a1488ddec26210f404fdd0f (diff) | |
| parent | 366a97c980f068a3ed665d337d644ee58cd25ca0 (diff) | |
| download | emacs-482fa0d9ed3d1b5ef6b95e908b5684a1f24cef4a.tar.gz | |
Merge from origin/emacs-27
366a97c980 (origin/emacs-27) Avoid crashes when trying to load bad GI...
7938713105 C++ Mode: handle comma separated brace initializers.
2b95300cf8 * lisp/display-fill-column-indicator.el: Fix bug#41145
Diffstat (limited to 'lisp/cus-dep.el')
| -rw-r--r-- | lisp/cus-dep.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el index f1061a8621b..b1027ce34f9 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)))) |