aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2011-03-14 12:18:25 -0400
committerChong Yidong2011-03-14 12:18:25 -0400
commit2aa46d6cce6773a0c56c93ca64750caea6ed3bba (patch)
treec0efb10ceb76e93a4bc31b4b04a31fc48d69d51e /src
parent70436396856202fb116f11c6e211e163cc22237b (diff)
downloademacs-2aa46d6cce6773a0c56c93ca64750caea6ed3bba.tar.gz
emacs-2aa46d6cce6773a0c56c93ca64750caea6ed3bba.zip
* src/buffer.c (Fmake_indirect_buffer): Fix incorrect assertion.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/buffer.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bad9b8dd4b7..8e5c9564f55 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-03-14 Chong Yidong <cyd@stupidchicken.com>
2
3 * buffer.c (Fmake_indirect_buffer): Fix incorrect assertion.
4
12011-03-13 Chong Yidong <cyd@stupidchicken.com> 52011-03-13 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * buffer.h (BUF_BEGV, BUF_BEGV_BYTE, BUF_ZV, BUF_ZV_BYTE, BUF_PT) 7 * buffer.h (BUF_BEGV, BUF_BEGV_BYTE, BUF_ZV, BUF_ZV_BYTE, BUF_PT)
diff --git a/src/buffer.c b/src/buffer.c
index 01940728275..c0485c10a99 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,