Mercurial > emacs
comparison src/fileio.c @ 83389:732c5740ca8f
Merged from miles@gnu.org--gnu-2005 (patch 610-614)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-610
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-611
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-612
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-613
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-614
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-429
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sun, 23 Oct 2005 22:47:29 +0000 |
parents | 2a679c81f552 60419121ec96 |
children | 03934708f1e9 |
comparison
equal
deleted
inserted
replaced
83388:0cd72d94a6c7 | 83389:732c5740ca8f |
---|---|
5795 else | 5795 else |
5796 message2_nolog (msgbuf, nbytes, STRING_MULTIBYTE (msg)); | 5796 message2_nolog (msgbuf, nbytes, STRING_MULTIBYTE (msg)); |
5797 Fsleep_for (make_number (1), Qnil); | 5797 Fsleep_for (make_number (1), Qnil); |
5798 } | 5798 } |
5799 | 5799 |
5800 SAFE_FREE (); | |
5800 UNGCPRO; | 5801 UNGCPRO; |
5801 return Qnil; | 5802 return Qnil; |
5802 } | 5803 } |
5803 | 5804 |
5804 Lisp_Object | 5805 Lisp_Object |