Mercurial > emacs
diff src/emacs.c @ 83304:6fef25c75847
Merged from miles@gnu.org--gnu-2005 (patch 296-306)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-296
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-297
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-298
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-299
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-300
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-301
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-302
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-303
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-304
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-305
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-306
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-344
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 13 May 2005 22:59:23 +0000 |
parents | b151ec53c504 296a69e064b3 |
children | 8b66fddd72c5 |
line wrap: on
line diff
--- a/src/emacs.c Mon May 09 16:17:25 2005 +0000 +++ b/src/emacs.c Fri May 13 22:59:23 2005 +0000 @@ -1326,6 +1326,7 @@ syms_of_search (); syms_of_frame (); + init_atimer (); mac_term_init (build_string ("Mac"), NULL, NULL); init_keyboard (); #endif @@ -1351,7 +1352,9 @@ #ifdef CLASH_DETECTION init_filelock (); #endif +#ifndef MAC_OS8 init_atimer (); +#endif running_asynch_code = 0; /* Handle --unibyte and the EMACS_UNIBYTE envvar,