Merge from emacs-24; up to 2012-05-01T00:16:02Z!rgm@gnu.org
authorChong Yidong <cyd@gnu.org>
Fri, 6 Jul 2012 04:31:46 +0000 (12:31 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 6 Jul 2012 04:31:46 +0000 (12:31 +0800)
commit226c3633fdc0a259aa73aa9e6555cd42dd9f168c
tree12da0bceba480b35f363bcdc99f6a320e85864f0
parentd4913798ad8e836c8442e0df7f8f205beadba5d1
parentcb4429739a65b6a17511ef85cdcb1846c5a088c2
Merge from emacs-24; up to 2012-05-01T00:16:02Z!rgm@gnu.org
doc/emacs/ChangeLog
doc/emacs/basic.texi
doc/emacs/maintaining.texi
lisp/ChangeLog
lisp/files.el
lisp/simple.el