Merged from miles@gnu.org--gnu-2005 (patch 447-448)
authorKaroly Lorentey <lorentey@elte.hu>
Sun, 26 Jun 2005 21:12:57 +0000 (21:12 +0000)
committerKaroly Lorentey <lorentey@elte.hu>
Sun, 26 Jun 2005 21:12:57 +0000 (21:12 +0000)
commitd836b39b818551c04c7e598176d3f26be7abfa5e
tree51bad97e4eeb9af7e1e00646a324a38e33466beb
parent4ea81208d4c43df774e540a603be8f68cb470466
parentc3bf675dd1caa64c514dcac38e2d21c64597f9ff
Merged from miles@gnu.org--gnu-2005 (patch 447-448)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-447
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-448
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-360
lisp/cus-face.el
lisp/faces.el
lisp/simple.el
lisp/subr.el
src/dispextern.h
src/fileio.c
src/lread.c
src/xdisp.c
src/xfns.c