diff options
| author | Gregory Heytings | 2022-11-24 14:21:30 +0100 |
|---|---|---|
| committer | Gregory Heytings | 2022-11-24 14:21:30 +0100 |
| commit | ba9315b1641b483f2bf843c38dcdba0cd1643a55 (patch) | |
| tree | d119cae86c7386db66be72972d90f6c83215974d /src/buffer.h | |
| parent | aef803d6c3d61004f15d0bc82fa7bf9952302312 (diff) | |
| parent | a3b654e069e563b0a2a6335ec310ada51400ac09 (diff) | |
| download | emacs-ba9315b1641b483f2bf843c38dcdba0cd1643a55.tar.gz emacs-ba9315b1641b483f2bf843c38dcdba0cd1643a55.zip | |
Merge master into feature/improved-locked-narrowing.
Diffstat (limited to 'src/buffer.h')
| -rw-r--r-- | src/buffer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/buffer.h b/src/buffer.h index 3ea4125645d..2e80c8a7b04 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
| @@ -1170,7 +1170,6 @@ extern EMACS_INT fix_position (Lisp_Object); | |||
| 1170 | extern void delete_all_overlays (struct buffer *); | 1170 | extern void delete_all_overlays (struct buffer *); |
| 1171 | extern void reset_buffer (struct buffer *); | 1171 | extern void reset_buffer (struct buffer *); |
| 1172 | extern void compact_buffer (struct buffer *); | 1172 | extern void compact_buffer (struct buffer *); |
| 1173 | extern void evaporate_overlays (ptrdiff_t); | ||
| 1174 | extern ptrdiff_t overlays_at (ptrdiff_t, bool, Lisp_Object **, ptrdiff_t *, ptrdiff_t *); | 1173 | extern ptrdiff_t overlays_at (ptrdiff_t, bool, Lisp_Object **, ptrdiff_t *, ptrdiff_t *); |
| 1175 | extern ptrdiff_t overlays_in (ptrdiff_t, ptrdiff_t, bool, Lisp_Object **, | 1174 | extern ptrdiff_t overlays_in (ptrdiff_t, ptrdiff_t, bool, Lisp_Object **, |
| 1176 | ptrdiff_t *, bool, bool, ptrdiff_t *); | 1175 | ptrdiff_t *, bool, bool, ptrdiff_t *); |