diff options
| author | Andrea Corallo | 2020-03-29 12:31:24 +0100 |
|---|---|---|
| committer | Andrea Corallo | 2020-03-29 12:31:24 +0100 |
| commit | 00ee320a620704ae12a1e2104c2d08bf8bbdf0c9 (patch) | |
| tree | 498c59219b572c89e10f9521b54c98896cb52ca9 /src/buffer.h | |
| parent | 530faee2752c7b316fa21f2ac4d1266d3e7a38e6 (diff) | |
| parent | 76b3bd8cbb9a0a01941d9c1766c054960e4bfd97 (diff) | |
| download | emacs-00ee320a620704ae12a1e2104c2d08bf8bbdf0c9.tar.gz emacs-00ee320a620704ae12a1e2104c2d08bf8bbdf0c9.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'src/buffer.h')
| -rw-r--r-- | src/buffer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/buffer.h b/src/buffer.h index fd05fdd37de..31f497ea40a 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
| @@ -1150,6 +1150,8 @@ extern Lisp_Object interval_insert_behind_hooks; | |||
| 1150 | extern Lisp_Object interval_insert_in_front_hooks; | 1150 | extern Lisp_Object interval_insert_in_front_hooks; |
| 1151 | 1151 | ||
| 1152 | 1152 | ||
| 1153 | extern EMACS_INT fix_position (Lisp_Object); | ||
| 1154 | #define CHECK_FIXNUM_COERCE_MARKER(x) ((x) = make_fixnum (fix_position (x))) | ||
| 1153 | extern void delete_all_overlays (struct buffer *); | 1155 | extern void delete_all_overlays (struct buffer *); |
| 1154 | extern void reset_buffer (struct buffer *); | 1156 | extern void reset_buffer (struct buffer *); |
| 1155 | extern void compact_buffer (struct buffer *); | 1157 | extern void compact_buffer (struct buffer *); |