Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-153
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-154
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-155
   Remove nick-abbrevs stuff from rcirc.el

 * emacs@sv.gnu.org/emacs--devo--0--patch-156
   rcirc.el update from Ryan Yeske

 * emacs@sv.gnu.org/emacs--devo--0--patch-157
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-158
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-159
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-532

diff --cc lisp/cus-start.el
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/macterm.h
Simple merge

diff --cc src/w32term.c
Simple merge

diff --cc src/xterm.c
Simple merge