Merged from miles@gnu.org--gnu-2005 (patch 183)
authorKaroly Lorentey <lorentey@elte.hu>
Wed, 16 Mar 2005 16:06:45 +0000 (16:06 +0000)
committerKaroly Lorentey <lorentey@elte.hu>
Wed, 16 Mar 2005 16:06:45 +0000 (16:06 +0000)
Patches applied:

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

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

1  2 
lisp/simple.el

diff --cc lisp/simple.el
Simple merge