summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/buffer.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3eb47219f30..e33a080cdda 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-06 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * buffer.h (struct buffer): Revert `indirections' to a simple int;
+ that should be sufficient for everyone.
+
2012-08-06 Jan Djärv <jan.h.d@swipnet.se>
* keyboard.c (timer_check_2): Add break so timer_check returns next
diff --git a/src/buffer.h b/src/buffer.h
index 9ca714b6707..54e7ef288ed 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -778,7 +778,7 @@ struct buffer
/* In an indirect buffer, this is -1. In an ordinary buffer,
it's the number of indirect buffers that share our text;
zero means that we're the only owner of this text. */
- ptrdiff_t indirections;
+ int indirections;
/* A non-zero value in slot IDX means that per-buffer variable
with index IDX has a local value in this buffer. The index IDX