Merge from mainline.
commit8289296548281f6fa4c8b6b1ee9ead764c4c9aa3
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 29 Mar 2011 23:35:49 +0000 (29 16:35 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 29 Mar 2011 23:35:49 +0000 (29 16:35 -0700)
tree61d1528d9dab94f1be62dd0c76496c9edd00dc1f
parent792c7b2ba5319f436b459ff2c0d21e20207db550
parentd806ab682a8e914345db3f2eede292f85745c98c
Merge from mainline.
src/ChangeLog
src/character.c
src/coding.c
src/editfns.c
src/eval.c
src/keyboard.c
src/lisp.h
src/xdisp.c