diff options
| author | Tom Tromey | 2013-07-26 14:02:53 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-07-26 14:02:53 -0600 |
| commit | cc231cbe45d27a1906d268fb72d3b4105a2e9c65 (patch) | |
| tree | c011828e2a3a18e77eaa8849e3cccb805d798f42 /src/buffer.h | |
| parent | b34a529f177a6ea32da5cb1254f91bf9d71838db (diff) | |
| parent | fec9206062b420aca84f53d05a72c3ee43244022 (diff) | |
| download | emacs-cc231cbe45d27a1906d268fb72d3b4105a2e9c65.tar.gz emacs-cc231cbe45d27a1906d268fb72d3b4105a2e9c65.zip | |
merge from trunk
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 2b0b49dddad..6c0058ee8f3 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
| @@ -1069,6 +1069,8 @@ extern Lisp_Object buffer_local_value_1 (Lisp_Object, Lisp_Object); | |||
| 1069 | extern void record_buffer (Lisp_Object); | 1069 | extern void record_buffer (Lisp_Object); |
| 1070 | extern void fix_overlays_before (struct buffer *, ptrdiff_t, ptrdiff_t); | 1070 | extern void fix_overlays_before (struct buffer *, ptrdiff_t, ptrdiff_t); |
| 1071 | extern void mmap_set_vars (bool); | 1071 | extern void mmap_set_vars (bool); |
| 1072 | extern void restore_buffer (Lisp_Object); | ||
| 1073 | extern void set_buffer_if_live (Lisp_Object); | ||
| 1072 | 1074 | ||
| 1073 | /* Set the current buffer to B. | 1075 | /* Set the current buffer to B. |
| 1074 | 1076 | ||