diff options
| author | Yoshiaki Kasahara | 2012-01-18 23:01:35 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-01-18 23:01:35 +0800 |
| commit | 893d44a1693a196f3022492f66c0205b7ccbeb47 (patch) | |
| tree | c1de618ffe9fab9a0a052b393bf8b08b1fb67201 /src | |
| parent | c3fae8e7fad0b8f7b4f4ddbf54ecda182476313d (diff) | |
| download | emacs-893d44a1693a196f3022492f66c0205b7ccbeb47.tar.gz emacs-893d44a1693a196f3022492f66c0205b7ccbeb47.zip | |
Fix init_buffer for USE_MMAP_FOR_BUFFERS case (backport from trunk)
* buffer.c (init_buffer) [USE_MMAP_FOR_BUFFERS]: Adjust to
aliasing change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/buffer.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2238c1b8bfd..18b96b04195 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-01-18 Yoshiaki Kasahara <kasahara@nc.kyushu-u.ac.jp> (tiny change) | ||
| 2 | |||
| 3 | * buffer.c (init_buffer) [USE_MMAP_FOR_BUFFERS]: Adjust to | ||
| 4 | aliasing change. | ||
| 5 | |||
| 1 | 2012-01-15 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 6 | 2012-01-15 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 2 | 7 | ||
| 3 | * xftfont.c (xftfont_draw): Use the font metrics of s->font to | 8 | * xftfont.c (xftfont_draw): Use the font metrics of s->font to |
diff --git a/src/buffer.c b/src/buffer.c index 5e2fda807dc..714f764bc11 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -5338,7 +5338,7 @@ init_buffer () | |||
| 5338 | Map new memory. */ | 5338 | Map new memory. */ |
| 5339 | struct buffer *b; | 5339 | struct buffer *b; |
| 5340 | 5340 | ||
| 5341 | for (b = all_buffers; b; b = b->next) | 5341 | for (b = all_buffers; b; b = b->header.next.buffer) |
| 5342 | if (b->text->beg == NULL) | 5342 | if (b->text->beg == NULL) |
| 5343 | enlarge_buffer_text (b, 0); | 5343 | enlarge_buffer_text (b, 0); |
| 5344 | } | 5344 | } |