diff options
| author | Miles Bader | 2006-07-19 00:42:56 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-07-19 00:42:56 +0000 |
| commit | 63db3c1b3ffa669435b10aa362115ef664990ab2 (patch) | |
| tree | a62f68b147d4265ce993136af897d4f348570594 /src/buffer.h | |
| parent | 2988d6b36d310ba98ea1fed570142f436804fc18 (diff) | |
| parent | 83676aa2e399363120942ef5ea19f8af6b75e8e8 (diff) | |
| download | emacs-63db3c1b3ffa669435b10aa362115ef664990ab2.tar.gz emacs-63db3c1b3ffa669435b10aa362115ef664990ab2.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 343-356)
- Update from CVS
- Update for ERC 5.1.3.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 113-115)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-90
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 8015b2be15c..9d3ca6ea463 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
| @@ -837,7 +837,7 @@ extern void set_buffer_internal P_ ((struct buffer *)); | |||
| 837 | extern void set_buffer_internal_1 P_ ((struct buffer *)); | 837 | extern void set_buffer_internal_1 P_ ((struct buffer *)); |
| 838 | extern void set_buffer_temp P_ ((struct buffer *)); | 838 | extern void set_buffer_temp P_ ((struct buffer *)); |
| 839 | extern void record_buffer P_ ((Lisp_Object)); | 839 | extern void record_buffer P_ ((Lisp_Object)); |
| 840 | extern void buffer_slot_type_mismatch P_ ((int)); | 840 | extern void buffer_slot_type_mismatch P_ ((int)) NO_RETURN; |
| 841 | extern void fix_overlays_before P_ ((struct buffer *, EMACS_INT, EMACS_INT)); | 841 | extern void fix_overlays_before P_ ((struct buffer *, EMACS_INT, EMACS_INT)); |
| 842 | extern void mmap_set_vars P_ ((int)); | 842 | extern void mmap_set_vars P_ ((int)); |
| 843 | 843 | ||