[Emacs-diffs] /srv/bzr/emacs/trunk r112854: * emacs.c (main) [HAVE_GFILENOTIFY]: Call globals_of_gfilenotify.

[Michael Albinus]

------------------------------------------------------------
revno: 112854
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Wed 2013-06-05 14:17:02 +0200
message:
  * 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.
modified:
  src/ChangeLog
  src/emacs.c
  src/gfilenotify.c
  src/lisp.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-05 01:58:43 +0000
+++ b/src/ChangeLog     2013-06-05 12:17:02 +0000
@@ -1,3 +1,12 @@
+2013-06-05  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * keymap.c (Fcurrent_active_maps, Fdescribe_buffer_bindings):

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2013-06-03 13:03:05 +0000
+++ b/src/emacs.c       2013-06-05 12:17:02 +0000
@@ -1250,6 +1250,10 @@
     tzset ();
 #endif /* MSDOS */
 
+#ifdef HAVE_GFILENOTIFY
+  globals_of_gfilenotify ();
+#endif
+
 #ifdef WINDOWSNT
   globals_of_w32 ();
 #ifdef HAVE_W32NOTIFY

=== modified file 'src/gfilenotify.c'
--- a/src/gfilenotify.c 2013-06-03 13:03:05 +0000
+++ b/src/gfilenotify.c 2013-06-05 12:17:02 +0000
@@ -233,11 +233,16 @@
 
 
 void
+globals_of_gfilenotify (void)
+{
+  g_type_init ();
+  watch_list = Qnil;
+}
+
+void
 syms_of_gfilenotify (void)
 {
 
-  g_type_init ();
-
   DEFSYM (Qgfile_add_watch, "gfile-add-watch");
   defsubr (&Sgfile_add_watch);
 
@@ -255,8 +260,6 @@
   DEFSYM (Qunmounted, "unmounted");
   DEFSYM (Qmoved, "moved");
 
-  /* Initialize internal objects.  */
-  watch_list = Qnil;
   staticpro (&watch_list);
 
   Fprovide (intern_c_string ("gfilenotify"), Qnil);

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2013-06-03 13:03:05 +0000
+++ b/src/lisp.h        2013-06-05 12:17:02 +0000
@@ -3786,6 +3786,7 @@
 
 /* Defined in gfilenotify.c */
 #ifdef HAVE_GFILENOTIFY
+extern void globals_of_gfilenotify (void);
 extern void syms_of_gfilenotify (void);
 #endif