diff options
| author | Miles Bader | 2005-07-22 08:27:27 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-07-22 08:27:27 +0000 |
| commit | 3674ae2f87e47a654524af689ea610ee3edeaca7 (patch) | |
| tree | 58ea33c40c8521a79fb503080b8bb6231ffbf579 /src/buffer.h | |
| parent | 3e03f554f116e04ba860dcde7c6d862939911e16 (diff) | |
| parent | 7929f858f8897f0448771a471f8afc5f244e4bca (diff) | |
| download | emacs-3674ae2f87e47a654524af689ea610ee3edeaca7.tar.gz emacs-3674ae2f87e47a654524af689ea610ee3edeaca7.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-71
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 485-492)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 92-94)
- Merge from emacs--cvs-trunk--0
- Update from CVS
Diffstat (limited to 'src/buffer.h')
| -rw-r--r-- | src/buffer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/buffer.h b/src/buffer.h index d97640d6cea..12475ce26a8 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Header file for the buffer manipulation primitives. | 1 | /* Header file for the buffer manipulation primitives. |
| 2 | Copyright (C) 1985,86,93,94,95,97,98,99,2000,01,03,04 | 2 | Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, |
| 3 | Free Software Foundation, Inc. | 3 | 2003, 2004, 2005 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -860,6 +860,7 @@ EXFUN (Fget_file_buffer, 1); | |||
| 860 | EXFUN (Fnext_overlay_change, 1); | 860 | EXFUN (Fnext_overlay_change, 1); |
| 861 | EXFUN (Fdelete_overlay, 1); | 861 | EXFUN (Fdelete_overlay, 1); |
| 862 | EXFUN (Fbuffer_local_value, 2); | 862 | EXFUN (Fbuffer_local_value, 2); |
| 863 | EXFUN (Fgenerate_new_buffer_name, 2); | ||
| 863 | 864 | ||
| 864 | /* Functions to call before and after each text change. */ | 865 | /* Functions to call before and after each text change. */ |
| 865 | extern Lisp_Object Vbefore_change_functions; | 866 | extern Lisp_Object Vbefore_change_functions; |