Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Sat, 19 Mar 2011 18:49:31 +0000 (14:49 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 19 Mar 2011 18:49:31 +0000 (14:49 -0400)
commitb14e3e21ec6702d27257a1400681fc36ee10282f
treeb57ce354a1ca3637a4cad3fe1fcc6f42bfc2efa5
parent4525ce3eb56a1f4b7c50eac9217854bbd170f660
parent20f5695598d3137257e24802479d003ea82eb5f9
Merge changes from emacs-23 branch
configure.in
doc/lispref/ChangeLog
doc/lispref/keymaps.texi
doc/lispref/nonascii.texi
doc/lispref/strings.texi
lisp/ChangeLog
lisp/avoid.el
lisp/info.el
lisp/vc/emerge.el
src/ChangeLog
src/xfaces.c