Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Jan 2011 19:24:36 +0000 (11:24 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Jan 2011 19:24:36 +0000 (11:24 -0800)
commit15ef8755824eef3336ebb95dbeacb39214f89503
tree6fa45b0bd14c8af9f1ae202cb9759985a916fbf6
parent3cbecb8f286aa3309f68d9909317e03df4f597d6
parent717c30e0027175fc8bb849728e5c9b4c3e9b2adf
Merge from mainline.
src/ChangeLog
src/fileio.c
src/lisp.h
src/regex.c
src/xfns.c