Merge branch 'feature/fix-the-long-lines-display-bug'

1 files changed, 8 insertions, 3 deletions

diff --git a/src/buffer.h b/src/buffer.h
index 135eaf72d30..47b4bdf749b 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -237,9 +237,10 @@ struct buffer_text
     ptrdiff_t z_byte;           /* Byte pos of end of buffer.  */
     ptrdiff_t gap_size;         /* Size of buffer's gap.  */
     modiff_count modiff;        /* This counts buffer-modification events
-                                   for this buffer.  It is incremented for
-                                   each such event, and never otherwise
-                                   changed.  */
+                                   for this buffer.  It is increased
+                                   logarithmically to the extent of the
+                                   modification for each such event,
+                                   and never otherwise changed.  */
     modiff_count chars_modiff;  /* This is modified with character change
                                    events for this buffer.  It is set to
                                    modiff for each such event, and never
@@ -681,6 +682,10 @@ struct buffer
      defined, as well as by with-temp-buffer, for example.  */
   bool_bf inhibit_buffer_hooks : 1;
 
+  /* Non-zero when the buffer contains long lines and specific
+     display optimizations must be used.  */
+  bool_bf long_line_optimizations_p : 1;
+
   /* List of overlays that end at or before the current center,
      in order of end-position.  */
   struct Lisp_Overlay *overlays_before;