diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/doc.c | 2 | ||||
| -rw-r--r-- | src/makefile.w32-in | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 063d65475ef..a44d97d96a1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -10,6 +10,15 @@ current display element is a grapheme cluster in bidi-reordered region. +2010-09-21 Ari Roponen <ari.roponen@gmail.com> (tiny change) + + * doc.c (Fsnarf_documentation): Use memmove instead of memcpy as + the regions may overlap. + +2010-09-21 Juanma Barranquero <lekktu@gmail.com> + + * makefile.w32-in ($(BLD)/sysdep.$(O)): Update dependencies. + 2010-09-21 Dan Nicolaescu <dann@ics.uci.edu> * emacs.c: Do not include sys/ioctl.h, not needed. diff --git a/src/doc.c b/src/doc.c index f8ab9d081b9..36f7c0e882a 100644 --- a/src/doc.c +++ b/src/doc.c @@ -678,7 +678,7 @@ the same file name is found in the `doc-directory'. */) } pos += end - buf; filled -= end - buf; - memcpy (buf, end, filled); + memmove (buf, end, filled); } emacs_close (fd); return Qnil; diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 8d99d6cedfe..752a3c211b3 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -1344,7 +1344,6 @@ $(BLD)/sysdep.$(O) : \ $(EMACS_ROOT)/nt/inc/pwd.h \ $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/file.h \ - $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ $(EMACS_ROOT)/nt/inc/sys/socket.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(SRC)/lisp.h \ |