diff options
| author | Alan Mackenzie | 2017-02-05 16:28:53 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2017-02-05 16:28:53 +0000 |
| commit | d5514332d4a6092673ce1f78fadcae0c57f7be64 (patch) | |
| tree | 1780337154904dcfad8ecfa76614b47c082160dd /src/buffer.c | |
| parent | cecc25c68f5a1834c356e18259aa2af402a70ce1 (diff) | |
| parent | de3336051ef74e0c3069374ced5b5fc7bb9fba15 (diff) | |
| download | emacs-d5514332d4a6092673ce1f78fadcae0c57f7be64.tar.gz emacs-d5514332d4a6092673ce1f78fadcae0c57f7be64.zip | |
Merge branch 'master' into comment-cache
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index cad28f2cde6..0a317ad7d98 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Buffer manipulation primitives for GNU Emacs. | 1 | /* Buffer manipulation primitives for GNU Emacs. |
| 2 | 2 | ||
| 3 | Copyright (C) 1985-1989, 1993-1995, 1997-2016 Free Software Foundation, | 3 | Copyright (C) 1985-1989, 1993-1995, 1997-2017 Free Software Foundation, |
| 4 | Inc. | 4 | Inc. |
| 5 | 5 | ||
| 6 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| @@ -32,6 +32,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 32 | 32 | ||
| 33 | #include "lisp.h" | 33 | #include "lisp.h" |
| 34 | #include "intervals.h" | 34 | #include "intervals.h" |
| 35 | #include "process.h" | ||
| 35 | #include "systime.h" | 36 | #include "systime.h" |
| 36 | #include "window.h" | 37 | #include "window.h" |
| 37 | #include "commands.h" | 38 | #include "commands.h" |