Merge from emacs--rel--22
commitffe832ea680b4820f5ff399191f7f2d41350ee2e
authorMiles Bader <miles@gnu.org>
Mon, 25 Feb 2008 00:21:57 +0000 (25 00:21 +0000)
committerMiles Bader <miles@gnu.org>
Mon, 25 Feb 2008 00:21:57 +0000 (25 00:21 +0000)
treedd42d69046f8209a8e2c89f54409ac7a0ce9bf7d
parentd8891294b81672883c21b6b957e5a17b6990b8e4
parentff20fdbbd2bbfa87a058c182768e3731025013ca
Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1081
lisp/ChangeLog
lisp/ChangeLog.12
lisp/files.el
src/ChangeLog
src/w32fns.c