Merge from emacs--rel--22
commit9850eff524bd0747a9561f3b4c90dfc3749f4ecb
authorMiles Bader <miles@gnu.org>
Tue, 2 Sep 2008 05:35:54 +0000 (2 05:35 +0000)
committerMiles Bader <miles@gnu.org>
Tue, 2 Sep 2008 05:35:54 +0000 (2 05:35 +0000)
treec05e918b9763310aea577eefc476aaccf20eb86a
parent9a73a6c9dbd5a98e8e27cccbf1361f89070b94e7
parent7f02dd2cf6cb7395cb06104fd052f08cc91e9e10
Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1398
admin/nt/README-ftp-server
lisp/ChangeLog
lisp/emulation/tpu-edt.el
lisp/image-mode.el
lisp/tool-bar.el
src/ChangeLog
src/fileio.c
src/w32menu.c
src/xterm.c