diff options
| author | Paul Eggert | 2011-03-17 09:32:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-17 09:32:03 -0700 |
| commit | b1d876f1a19ae65c8a8dd61c4ce17055ca53f16c (patch) | |
| tree | 5dd8a40d7e3e0b86749cecfee7443ad81bdbfe5e /src/buffer.c | |
| parent | b766f86726fc2828a035cb8db149598a3a84de96 (diff) | |
| parent | d6cd56f187a791983579bf5d4ce3702d2ddf2499 (diff) | |
| download | emacs-b1d876f1a19ae65c8a8dd61c4ce17055ca53f16c.tar.gz emacs-b1d876f1a19ae65c8a8dd61c4ce17055ca53f16c.zip | |
Merge from mainline.
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/buffer.c b/src/buffer.c index b718bf3e576..c0e6866dee1 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -611,8 +611,8 @@ CLONE nil means the indirect buffer's state is reset to default values. */) | |||
| 611 | /* Make sure the base buffer has markers for its narrowing. */ | 611 | /* Make sure the base buffer has markers for its narrowing. */ |
| 612 | if (NILP (BVAR (b->base_buffer, pt_marker))) | 612 | if (NILP (BVAR (b->base_buffer, pt_marker))) |
| 613 | { | 613 | { |
| 614 | eassert (NILP (BVAR (b, begv_marker))); | 614 | eassert (NILP (BVAR (b->base_buffer, begv_marker))); |
| 615 | eassert (NILP (BVAR (b, zv_marker))); | 615 | eassert (NILP (BVAR (b->base_buffer, zv_marker))); |
| 616 | 616 | ||
| 617 | BVAR (b->base_buffer, pt_marker) = Fmake_marker (); | 617 | BVAR (b->base_buffer, pt_marker) = Fmake_marker (); |
| 618 | set_marker_both (BVAR (b->base_buffer, pt_marker), base_buffer, | 618 | set_marker_both (BVAR (b->base_buffer, pt_marker), base_buffer, |