aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-08-06 12:22:43 -0400
committerStefan Monnier2012-08-06 12:22:43 -0400
commitcbcc70072ca522afbf01a6bcd0890a5ffaa730aa (patch)
tree932d1cc993202e6c4a18748b45fb9146ed67d3b6
parent4d365fa4cc083c4f84d1af8bcefc8852c9530307 (diff)
downloademacs-cbcc70072ca522afbf01a6bcd0890a5ffaa730aa.tar.gz
emacs-cbcc70072ca522afbf01a6bcd0890a5ffaa730aa.zip
* src/buffer.h (struct buffer): Revert `indirections' to a simple int;
that should be sufficient for everyone.
-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 @@
12012-08-06 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * buffer.h (struct buffer): Revert `indirections' to a simple int;
4 that should be sufficient for everyone.
5
12012-08-06 Jan Djärv <jan.h.d@swipnet.se> 62012-08-06 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * keyboard.c (timer_check_2): Add break so timer_check returns next 8 * 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
778 /* In an indirect buffer, this is -1. In an ordinary buffer, 778 /* In an indirect buffer, this is -1. In an ordinary buffer,
779 it's the number of indirect buffers that share our text; 779 it's the number of indirect buffers that share our text;
780 zero means that we're the only owner of this text. */ 780 zero means that we're the only owner of this text. */
781 ptrdiff_t indirections; 781 int indirections;
782 782
783 /* A non-zero value in slot IDX means that per-buffer variable 783 /* A non-zero value in slot IDX means that per-buffer variable
784 with index IDX has a local value in this buffer. The index IDX 784 with index IDX has a local value in this buffer. The index IDX