Merge from emacs-24; up to 2012-04-16T19:06:02Z!rgm@gnu.org
commit90207a152538c00b6c75b9774b528470dfb42717
authorGlenn Morris <rgm@gnu.org>
Wed, 2 May 2012 07:20:29 +0000 (2 00:20 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 2 May 2012 07:20:29 +0000 (2 00:20 -0700)
tree6ee42e42631521d624a85d69dc914161309726b2
parent6116bd7e7a88d47eb8bf0b830249461f47f8b943
parentcd3771a08b8a1fed5aa91eb2ac559d41801668ea
Merge from emacs-24; up to 2012-04-16T19:06:02Z!rgm@gnu.org
17 files changed:
ChangeLog
Makefile.in
configure.in
doc/emacs/ChangeLog
doc/lispintro/ChangeLog
doc/lispref/ChangeLog
doc/lispref/files.texi
doc/lispref/intro.texi
doc/lispref/loading.texi
doc/lispref/package.texi
doc/lispref/text.texi
doc/misc/ChangeLog
lisp/ChangeLog
lisp/mail/rmail.el
lisp/window.el
src/ChangeLog
src/xdisp.c