Merge from trunk.
commit9d6b4d53469a9ffd67bd770fabc6fe254e35c21d
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Mar 2012 02:29:30 +0000 (1 18:29 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Mar 2012 02:29:30 +0000 (1 18:29 -0800)
treede238c6f707915be9ed1f10235589b4e975a08fb
parenta89654f8f34114db543cb91363e8fded6d73e986
parenteec1549a6b89359b6d970f14dead275e59b7bc6f
Merge from trunk.
src/ChangeLog
src/alloc.c
src/fileio.c
src/lisp.h
src/xdisp.c