diff options
| author | Paul Eggert | 2011-01-14 10:14:17 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-14 10:14:17 -0800 |
| commit | 8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d (patch) | |
| tree | 9aed5489fdfdcf75087bf3d8e50e4f5952c8566c /src/buffer.h | |
| parent | 3720fa2b1ac94b8ac9f193264bcf36990a5f43d2 (diff) | |
| parent | f80aa5bfa90dff5cd75d1f40e4ababa3c86af7fb (diff) | |
| download | emacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.tar.gz emacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.zip | |
Merge from mainline.
Diffstat (limited to 'src/buffer.h')
| -rw-r--r-- | src/buffer.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/buffer.h b/src/buffer.h index 6ab10c78f8d..cdc5fba58a8 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
| @@ -1,8 +1,7 @@ | |||
| 1 | /* Header file for the buffer manipulation primitives. | 1 | /* Header file for the buffer manipulation primitives. |
| 2 | 2 | Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, | |
| 3 | Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, | 3 | 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 4 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 4 | Free Software Foundation, Inc. |
| 5 | Free Software Foundation, Inc. | ||
| 6 | 5 | ||
| 7 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 8 | 7 | ||