diff options
| author | Kenichi Handa | 2012-05-03 15:57:54 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-05-03 15:57:54 +0900 |
| commit | 1f110951b52c0d7705dd5891368efccbce95ec1a (patch) | |
| tree | 5d9683724eb455e9bcb8030fb61114b2e559457b /src/buffer.c | |
| parent | 2e51d4b5fb960ce0240a0eccbb0ed30cc7f53743 (diff) | |
| parent | 2bd785a208c84e7ae73884d09a1087da52780b4a (diff) | |
| download | emacs-1f110951b52c0d7705dd5891368efccbce95ec1a.tar.gz emacs-1f110951b52c0d7705dd5891368efccbce95ec1a.zip | |
merge trunk
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/buffer.c b/src/buffer.c index 9bac3ec742b..2ddbc699481 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -392,7 +392,6 @@ even if it is dead. The return value is never nil. */) | |||
| 392 | 392 | ||
| 393 | BVAR (b, mark) = Fmake_marker (); | 393 | BVAR (b, mark) = Fmake_marker (); |
| 394 | BUF_MARKERS (b) = NULL; | 394 | BUF_MARKERS (b) = NULL; |
| 395 | BVAR (b, name) = name; | ||
| 396 | 395 | ||
| 397 | /* Put this in the alist of all live buffers. */ | 396 | /* Put this in the alist of all live buffers. */ |
| 398 | XSETBUFFER (buffer, b); | 397 | XSETBUFFER (buffer, b); |
| @@ -612,7 +611,6 @@ CLONE nil means the indirect buffer's state is reset to default values. */) | |||
| 612 | Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil)); | 611 | Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil)); |
| 613 | 612 | ||
| 614 | BVAR (b, mark) = Fmake_marker (); | 613 | BVAR (b, mark) = Fmake_marker (); |
| 615 | BVAR (b, name) = name; | ||
| 616 | 614 | ||
| 617 | /* The multibyte status belongs to the base buffer. */ | 615 | /* The multibyte status belongs to the base buffer. */ |
| 618 | BVAR (b, enable_multibyte_characters) = BVAR (b->base_buffer, enable_multibyte_characters); | 616 | BVAR (b, enable_multibyte_characters) = BVAR (b->base_buffer, enable_multibyte_characters); |