diff options
| author | Joakim Verona | 2013-09-10 23:26:38 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-10 23:26:38 +0200 |
| commit | 92aeabcc8a007f521a664e3aee092eb80ad0f49a (patch) | |
| tree | 58fde2f218fa45ee1b2c67184b50137a8fb6e140 /src/buffer.c | |
| parent | ebc2ba4f6049d17fd41d2f1fc8d65efe309f6bf4 (diff) | |
| parent | 43aac990c339c0fc3304aa476ebc8ea8467f107e (diff) | |
| download | emacs-92aeabcc8a007f521a664e3aee092eb80ad0f49a.tar.gz emacs-92aeabcc8a007f521a664e3aee092eb80ad0f49a.zip | |
merge from trunk
Conflicts:
src/dispnew.c
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index d9525f247d0..e42dbb2befd 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -937,7 +937,7 @@ reset_buffer (register struct buffer *b) | |||
| 937 | bset_filename (b, Qnil); | 937 | bset_filename (b, Qnil); |
| 938 | bset_file_truename (b, Qnil); | 938 | bset_file_truename (b, Qnil); |
| 939 | bset_directory (b, current_buffer ? BVAR (current_buffer, directory) : Qnil); | 939 | bset_directory (b, current_buffer ? BVAR (current_buffer, directory) : Qnil); |
| 940 | b->modtime = make_emacs_time (0, UNKNOWN_MODTIME_NSECS); | 940 | b->modtime = make_timespec (0, UNKNOWN_MODTIME_NSECS); |
| 941 | b->modtime_size = -1; | 941 | b->modtime_size = -1; |
| 942 | XSETFASTINT (BVAR (b, save_length), 0); | 942 | XSETFASTINT (BVAR (b, save_length), 0); |
| 943 | b->last_window_start = 1; | 943 | b->last_window_start = 1; |