diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/alloc.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 29387dac5ec..9b4794a2c0b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-11-06 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * alloc.c (make_pure_c_string): Fix last change to avoid compiler | ||
| 4 | warning. | ||
| 5 | |||
| 1 | 2009-11-06 Jan Djärv <jan.h.d@swipnet.se> | 6 | 2009-11-06 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * gtkutil.c (xg_event_is_for_scrollbar): New function (bug#4870). | 8 | * gtkutil.c (xg_event_is_for_scrollbar): New function (bug#4870). |
diff --git a/src/alloc.c b/src/alloc.c index 97c4c45733d..bb148b37ba3 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -4832,7 +4832,7 @@ make_pure_c_string (const char *data) | |||
| 4832 | s = (struct Lisp_String *) pure_alloc (sizeof *s, Lisp_String); | 4832 | s = (struct Lisp_String *) pure_alloc (sizeof *s, Lisp_String); |
| 4833 | s->size = nchars; | 4833 | s->size = nchars; |
| 4834 | s->size_byte = -1; | 4834 | s->size_byte = -1; |
| 4835 | s->data = data; | 4835 | s->data = (unsigned char *) data; |
| 4836 | s->intervals = NULL_INTERVAL; | 4836 | s->intervals = NULL_INTERVAL; |
| 4837 | XSETSTRING (string, s); | 4837 | XSETSTRING (string, s); |
| 4838 | return string; | 4838 | return string; |