diff options
| author | Tom Tromey | 2013-06-13 11:29:06 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-06-13 11:29:06 -0600 |
| commit | 5ccb7e7b1ea2ca7f6e45d00d839e19f22cc961da (patch) | |
| tree | af9b79246f0b18d748c3e1c33b1bb1b33cf1fbe0 /src/emacs.c | |
| parent | 313dfb6277b3e1ef28c7bb76e776f10168e3f0a3 (diff) | |
| parent | 94fa6ec7b306b47c251f7b8b67662598027a7ff3 (diff) | |
| download | emacs-5ccb7e7b1ea2ca7f6e45d00d839e19f22cc961da.tar.gz emacs-5ccb7e7b1ea2ca7f6e45d00d839e19f22cc961da.zip | |
merge from trunk
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/emacs.c b/src/emacs.c index b4b726183cf..537574d93ab 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -1241,6 +1241,10 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem | |||
| 1241 | tzset (); | 1241 | tzset (); |
| 1242 | #endif /* MSDOS */ | 1242 | #endif /* MSDOS */ |
| 1243 | 1243 | ||
| 1244 | #ifdef HAVE_GFILENOTIFY | ||
| 1245 | globals_of_gfilenotify (); | ||
| 1246 | #endif | ||
| 1247 | |||
| 1244 | #ifdef WINDOWSNT | 1248 | #ifdef WINDOWSNT |
| 1245 | globals_of_w32 (); | 1249 | globals_of_w32 (); |
| 1246 | #ifdef HAVE_W32NOTIFY | 1250 | #ifdef HAVE_W32NOTIFY |