Merge from trunk; up to 2013-02-18T01:30:27Z!monnier@iro.umontreal.ca.

1 files changed, 59 insertions, 39 deletions

diff --git a/src/buffer.h b/src/buffer.h
index 1129840bd47..276cca32e48 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1,7 +1,7 @@
 /* Header file for the buffer manipulation primitives.
 
-Copyright (C) 1985-1986, 1993-1995, 1997-2012
-                 Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 1993-1995, 1997-2013 Free Software Foundation,
+Inc.
 
 This file is part of GNU Emacs.
 
@@ -82,9 +82,6 @@ INLINE_HEADER_BEGIN
 /* Size of gap.  */
 #define GAP_SIZE (current_buffer->text->gap_size)
 
-/* Is the current buffer narrowed?  */
-#define NARROWED        ((BEGV != BEG) || (ZV != Z))
-
 /* Modification count.  */
 #define MODIFF (current_buffer->text->modiff)
 
@@ -173,10 +170,6 @@ INLINE_HEADER_BEGIN
 /* Size of gap.  */
 #define BUF_GAP_SIZE(buf) ((buf)->text->gap_size)
 
-/* Is this buffer narrowed?  */
-#define BUF_NARROWED(buf) ((BUF_BEGV (buf) != BUF_BEG (buf)) \
-                           || (BUF_ZV (buf) != BUF_Z (buf)))
-
 /* Modification count.  */
 #define BUF_MODIFF(buf) ((buf)->text->modiff)
 
@@ -193,6 +186,9 @@ INLINE_HEADER_BEGIN
 /* FIXME: should we move this into ->text->auto_save_modiff?  */
 #define BUF_AUTOSAVE_MODIFF(buf) ((buf)->auto_save_modified)
 
+/* Compaction count.  */
+#define BUF_COMPACT(buf) ((buf)->text->compact)
+
 /* Marker chain of buffer.  */
 #define BUF_MARKERS(buf) ((buf)->text->markers)
 
@@ -291,24 +287,24 @@ extern void enlarge_buffer_text (struct buffer *, ptrdiff_t);
 /* Access a Lisp position value in POS,
    and store the charpos in CHARPOS and the bytepos in BYTEPOS.  */
 
-#define DECODE_POSITION(charpos, bytepos, pos)                  \
-do                                                              \
-  {                                                             \
-    Lisp_Object __pos = (pos);                                  \
-    if (NUMBERP (__pos))                                        \
-      {                                                         \
-        charpos = __pos;                                        \
-        bytepos = buf_charpos_to_bytepos (current_buffer, __pos);  \
-      }                                                         \
-    else if (MARKERP (__pos))                                   \
-      {                                                         \
-        charpos = marker_position (__pos);                      \
-        bytepos = marker_byte_position (__pos);                 \
-      }                                                         \
-    else                                                        \
-      wrong_type_argument (Qinteger_or_marker_p, __pos);        \
-  }                                                             \
-while (0)
+#define DECODE_POSITION(charpos, bytepos, pos)                          \
+  do                                                                    \
+    {                                                                   \
+      Lisp_Object __pos = (pos);                                        \
+      if (NUMBERP (__pos))                                              \
+        {                                                               \
+          charpos = __pos;                                              \
+          bytepos = buf_charpos_to_bytepos (current_buffer, __pos);     \
+        }                                                               \
+      else if (MARKERP (__pos))                                         \
+        {                                                               \
+          charpos = marker_position (__pos);                            \
+          bytepos = marker_byte_position (__pos);                       \
+        }                                                               \
+      else                                                              \
+        wrong_type_argument (Qinteger_or_marker_p, __pos);              \
+    }                                                                   \
+  while (0)
 
 /* Maximum number of bytes in a buffer.
    A buffer cannot contain more bytes than a 1-origin fixnum can represent,
@@ -317,6 +313,16 @@ while (0)
 #define BUF_BYTES_MAX \
   (ptrdiff_t) min (MOST_POSITIVE_FIXNUM - 1, min (SIZE_MAX, PTRDIFF_MAX))
 
+/* Maximum gap size after compact_buffer, in bytes.  Also
+   used in make_gap_larger to get some extra reserved space.  */
+
+#define GAP_BYTES_DFL 2000
+
+/* Minimum gap size after compact_buffer, in bytes.  Also
+   used in make_gap_smaller to avoid too small gap size.  */
+
+#define GAP_BYTES_MIN 20
+
 /* Return the address of byte position N in current buffer.  */
 
 #define BYTE_POS_ADDR(n) \
@@ -770,11 +776,15 @@ struct buffer
      In an ordinary buffer, it is 0.  */
   struct buffer *base_buffer;
 
-  /* In an indirect buffer, this is -1. In an ordinary buffer,
+  /* In an indirect buffer, this is -1.  In an ordinary buffer,
      it's the number of indirect buffers that share our text;
      zero means that we're the only owner of this text.  */
   int indirections;
 
+  /* Number of windows showing this buffer.  Always -1 for
+     an indirect buffer since it counts as its base buffer.  */
+  int window_count;
+
   /* A non-zero value in slot IDX means that per-buffer variable
      with index IDX has a local value in this buffer.  The index IDX
      for a buffer-local variable is stored in that variable's slot
@@ -992,15 +1002,15 @@ bset_width_table (struct buffer *b, Lisp_Object val)
 #define BUFFER_CHECK_INDIRECTION(b)                     \
   do {                                                  \
     if (BUFFER_LIVE_P (b))                              \
-    {                                                   \
-      if (b->base_buffer)                               \
-        {                                               \
-          eassert (b->indirections == -1);              \
-          eassert (b->base_buffer->indirections > 0);   \
-        }                                               \
-      else                                              \
-        eassert (b->indirections >= 0);                 \
-    }                                                   \
+      {                                                 \
+        if (b->base_buffer)                             \
+          {                                             \
+            eassert (b->indirections == -1);            \
+            eassert (b->base_buffer->indirections > 0); \
+          }                                             \
+        else                                            \
+          eassert (b->indirections >= 0);               \
+      }                                                 \
   } while (0)
 
 /* Chain of all buffers, including killed ones.  */
@@ -1061,7 +1071,6 @@ extern void set_buffer_internal_1 (struct buffer *);
 extern void set_buffer_temp (struct buffer *);
 extern Lisp_Object buffer_local_value_1 (Lisp_Object, Lisp_Object);
 extern void record_buffer (Lisp_Object);
-extern _Noreturn void buffer_slot_type_mismatch (Lisp_Object, int);
 extern void fix_overlays_before (struct buffer *, ptrdiff_t, ptrdiff_t);
 extern void mmap_set_vars (bool);
 
@@ -1173,7 +1182,18 @@ BUF_FETCH_MULTIBYTE_CHAR (struct buffer *buf, ptrdiff_t pos)
        + pos + BUF_BEG_ADDR (buf) - BEG_BYTE);
   return STRING_CHAR (p);
 }
-
+
+/* Return number of windows showing B.  */
+
+BUFFER_INLINE int
+buffer_window_count (struct buffer *b)
+{
+  if (b->base_buffer)
+    b = b->base_buffer;
+  eassert (b->window_count >= 0);
+  return b->window_count;
+}
+
 /* Overlays */
 
 /* Return the marker that stands for where OV starts in the buffer.  */