diff options
| author | Stefan Monnier | 2010-09-30 01:28:20 +0200 |
|---|---|---|
| committer | Stefan Monnier | 2010-09-30 01:28:20 +0200 |
| commit | a01a7932080e8a6e7bc8472c58cefabcc2c37df3 (patch) | |
| tree | 94b28b19c8f1536e76ffe7d5826811b74a79e3a5 /src/buffer.h | |
| parent | cc390e46c7ba95b76ea133d98fd386214cd01709 (diff) | |
| parent | 6b0f7311f16646e0de2045b2410e20921901c616 (diff) | |
| download | emacs-a01a7932080e8a6e7bc8472c58cefabcc2c37df3.tar.gz emacs-a01a7932080e8a6e7bc8472c58cefabcc2c37df3.zip | |
Merge from trunk
Diffstat (limited to 'src/buffer.h')
| -rw-r--r-- | src/buffer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buffer.h b/src/buffer.h index 339e7d9bb6d..3a4dd106360 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
| @@ -865,7 +865,7 @@ extern int overlays_at (EMACS_INT pos, int extend, Lisp_Object **vec_ptr, | |||
| 865 | EMACS_INT *prev_ptr, int change_req); | 865 | EMACS_INT *prev_ptr, int change_req); |
| 866 | extern int sort_overlays (Lisp_Object *, int, struct window *); | 866 | extern int sort_overlays (Lisp_Object *, int, struct window *); |
| 867 | extern void recenter_overlay_lists (struct buffer *, EMACS_INT); | 867 | extern void recenter_overlay_lists (struct buffer *, EMACS_INT); |
| 868 | extern int overlay_strings (EMACS_INT, struct window *, unsigned char **); | 868 | extern EMACS_INT overlay_strings (EMACS_INT, struct window *, unsigned char **); |
| 869 | extern void validate_region (Lisp_Object *, Lisp_Object *); | 869 | extern void validate_region (Lisp_Object *, Lisp_Object *); |
| 870 | extern void set_buffer_internal (struct buffer *); | 870 | extern void set_buffer_internal (struct buffer *); |
| 871 | extern void set_buffer_internal_1 (struct buffer *); | 871 | extern void set_buffer_internal_1 (struct buffer *); |