diff options
| author | Paul Eggert | 2011-02-18 22:25:05 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-18 22:25:05 -0800 |
| commit | f12f551b2c38748ed10ec8c350faa23516f7c705 (patch) | |
| tree | 32a1dcb90d6d7cb9f8ea3dfee6f6ae1d97745ae1 /src/alloc.c | |
| parent | 942f733fd1251da4486cf1d72ec5569532dfd19d (diff) | |
| parent | 203784ccb151e37d6b1e1306b1f3a63d3b6d66f3 (diff) | |
| download | emacs-f12f551b2c38748ed10ec8c350faa23516f7c705.tar.gz emacs-f12f551b2c38748ed10ec8c350faa23516f7c705.zip | |
Merge from mainline.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index e8b8f45e9b1..d7006ca6bfd 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -2301,7 +2301,6 @@ make_unibyte_string (const char *contents, EMACS_INT length) | |||
| 2301 | register Lisp_Object val; | 2301 | register Lisp_Object val; |
| 2302 | val = make_uninit_string (length); | 2302 | val = make_uninit_string (length); |
| 2303 | memcpy (SDATA (val), contents, length); | 2303 | memcpy (SDATA (val), contents, length); |
| 2304 | STRING_SET_UNIBYTE (val); | ||
| 2305 | return val; | 2304 | return val; |
| 2306 | } | 2305 | } |
| 2307 | 2306 | ||