From 760910f4917ad8ff5e1cd1bf0bfec443b02f0e44 Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen
Date: Sun, 14 Feb 2021 12:37:44 +0100
Subject: Add a new buffer-local variable `minor-modes'

* lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Keep
`minor-modes' updated.
* src/buffer.c (bset_minor_modes, Fmake_indirect_buffer)
(reset_buffer, init_buffer_once): Initialise `minor-modes'.
(syms_of_buffer): Add `minor-modes' as a new permanently-local
variable.

* src/buffer.h (struct buffer): Add minor_modes_.
---
 src/buffer.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/buffer.h')

diff --git a/src/buffer.h b/src/buffer.h
index 790291f1185..0668d16608b 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -338,6 +338,9 @@ struct buffer
   /* Symbol naming major mode (e.g., lisp-mode).  */
   Lisp_Object major_mode_;
 
+  /* Symbol listing all currently enabled minor modes.  */
+  Lisp_Object minor_modes_;
+
   /* Pretty name of major mode (e.g., "Lisp"). */
   Lisp_Object mode_name_;
 
-- 
cgit v1.2.1


From 0bd846c17474b161b11fbe21545609cd545b1798 Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen
Date: Mon, 15 Feb 2021 12:44:57 +0100
Subject: Rename minor-modes to local-minor-modes

* doc/lispref/modes.texi (Minor Modes): Update documentation.
* lisp/simple.el (completion-with-modes-p): Change usage.

* lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Change usage.

* src/buffer.c: Rename from minor_modes to local_minor_modes
throughout.
(syms_of_buffer): Rename minor-modes to local-minor-modes.

* src/buffer.h (struct buffer): Rename minor_modes_.

* src/pdumper.c (dump_buffer): Update hash and usage.
---
 src/buffer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/buffer.h')

diff --git a/src/buffer.h b/src/buffer.h
index 0668d16608b..24e9c3fcbc8 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -339,7 +339,7 @@ struct buffer
   Lisp_Object major_mode_;
 
   /* Symbol listing all currently enabled minor modes.  */
-  Lisp_Object minor_modes_;
+  Lisp_Object local_minor_modes_;
 
   /* Pretty name of major mode (e.g., "Lisp"). */
   Lisp_Object mode_name_;
-- 
cgit v1.2.1