diff options
| author | Joakim Verona | 2013-07-20 01:44:36 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-20 01:44:36 +0200 |
| commit | 759dbb1aebe68fb392f7ed53eba4b460ae6b83be (patch) | |
| tree | 1becc0cc6d676589eb274cb2c457e4256e908010 /src/buffer.h | |
| parent | 6c1769c85ecb61b40a1f9a3b56b61cdd6c1f8992 (diff) | |
| parent | 3f5bef16fab0ba83cb2298f8137fec831af1aec4 (diff) | |
| download | emacs-759dbb1aebe68fb392f7ed53eba4b460ae6b83be.tar.gz emacs-759dbb1aebe68fb392f7ed53eba4b460ae6b83be.zip | |
Merge branch 'trunk' into xwidget
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 276cca32e48..641a561cafc 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
| @@ -1073,6 +1073,8 @@ extern Lisp_Object buffer_local_value_1 (Lisp_Object, Lisp_Object); | |||
| 1073 | extern void record_buffer (Lisp_Object); | 1073 | extern void record_buffer (Lisp_Object); |
| 1074 | extern void fix_overlays_before (struct buffer *, ptrdiff_t, ptrdiff_t); | 1074 | extern void fix_overlays_before (struct buffer *, ptrdiff_t, ptrdiff_t); |
| 1075 | extern void mmap_set_vars (bool); | 1075 | extern void mmap_set_vars (bool); |
| 1076 | extern void restore_buffer (Lisp_Object); | ||
| 1077 | extern void set_buffer_if_live (Lisp_Object); | ||
| 1076 | 1078 | ||
| 1077 | /* Set the current buffer to B. | 1079 | /* Set the current buffer to B. |
| 1078 | 1080 | ||