Commit 90db8702 authored by Michael Albinus's avatar Michael Albinus

* emacs.c (main) [HAVE_GFILENOTIFY]: Call globals_of_gfilenotify.

* gfilenotify.c (globals_of_gfilenotify): New function.
(syms_of_gfilenotify): Move global initialization there.

* lisp.h (globals_of_gfilenotify) [HAVE_GFILENOTIFY]: Add prototype.
parent 976cb066
2013-06-05 Michael Albinus <michael.albinus@gmx.de>
* emacs.c (main) [HAVE_GFILENOTIFY]: Call globals_of_gfilenotify.
* gfilenotify.c (globals_of_gfilenotify): New function.
(syms_of_gfilenotify): Move global initialization there.
* lisp.h (globals_of_gfilenotify) [HAVE_GFILENOTIFY]: Add prototype.
2013-06-05 Stefan Monnier <monnier@iro.umontreal.ca>
* keymap.c (Fcurrent_active_maps, Fdescribe_buffer_bindings):
......
......@@ -1250,6 +1250,10 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
tzset ();
#endif /* MSDOS */
#ifdef HAVE_GFILENOTIFY
globals_of_gfilenotify ();
#endif
#ifdef WINDOWSNT
globals_of_w32 ();
#ifdef HAVE_W32NOTIFY
......
......@@ -233,10 +233,15 @@ WATCH-DESCRIPTOR should be an object returned by `gfile-add-watch'. */)
void
syms_of_gfilenotify (void)
globals_of_gfilenotify (void)
{
g_type_init ();
watch_list = Qnil;
}
void
syms_of_gfilenotify (void)
{
DEFSYM (Qgfile_add_watch, "gfile-add-watch");
defsubr (&Sgfile_add_watch);
......@@ -255,8 +260,6 @@ syms_of_gfilenotify (void)
DEFSYM (Qunmounted, "unmounted");
DEFSYM (Qmoved, "moved");
/* Initialize internal objects. */
watch_list = Qnil;
staticpro (&watch_list);
Fprovide (intern_c_string ("gfilenotify"), Qnil);
......
......@@ -3786,6 +3786,7 @@ extern Lisp_Object Qfont_param;
/* Defined in gfilenotify.c */
#ifdef HAVE_GFILENOTIFY
extern void globals_of_gfilenotify (void);
extern void syms_of_gfilenotify (void);
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment