diff options
author | Tom Tromey <tromey@redhat.com> | 2013-01-16 11:48:32 -0700 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2013-01-16 11:48:32 -0700 |
commit | 6f4de085f065e11f4df3195d47479f28f5ef08ba (patch) | |
tree | 1211a00f1afc86c2b73624897993db02a4852943 /src/buffer.h | |
parent | e078a23febca14bc919c5806670479c395e3253e (diff) | |
parent | ffe04adc88e546c406f9b050238fb98a7243c7a0 (diff) | |
download | emacs-6f4de085f065e11f4df3195d47479f28f5ef08ba.tar.gz |
merge from trunk
Diffstat (limited to 'src/buffer.h')
-rw-r--r-- | src/buffer.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/buffer.h b/src/buffer.h index 4bf2b4c2a0b..c0b0e227725 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -320,6 +320,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) \ @@ -1064,7 +1074,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); |