Merge commit '74e9799bd89484b8d15bdd6597c68fc00d07e7f7'

1 files changed, 8 insertions, 2 deletions

diff --git a/src/buffer.c b/src/buffer.c
index ea785bbcd70..77e8b6bb779 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -105,7 +105,7 @@ static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS];
 
 /* Number of per-buffer variables used.  */
 
-int last_per_buffer_idx;
+static int last_per_buffer_idx;
 
 static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay,
                                     bool after, Lisp_Object arg1,
@@ -655,6 +655,12 @@ set_buffer_overlays_after (struct buffer *b, struct Lisp_Overlay *o)
   b->overlays_after = o;
 }
 
+bool
+valid_per_buffer_idx (int idx)
+{
+  return 0 <= idx && idx < last_per_buffer_idx;
+}
+
 /* Clone per-buffer values of buffer FROM.
 
    Buffer TO gets the same per-buffer values as FROM, with the
@@ -4568,7 +4574,7 @@ report_overlay_modification (Lisp_Object start, Lisp_Object end, bool after,
         prop_i = copy[i++];
         overlay_i = copy[i++];
         /* It is possible that the recorded overlay has been deleted
-           (which makes it's markers' buffers be nil), or that (due to
+           (which makes its markers' buffers be nil), or that (due to
            some bug) it belongs to a different buffer.  Only run this
            hook if the overlay belongs to the current buffer.  */
         if (XMARKER (OVERLAY_START (overlay_i))->buffer == current_buffer)