diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2013-06-03 15:03:05 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2013-06-03 15:03:05 +0200 |
| commit | c9628c79bba5ec1e55c31512b5c32371ff034b1f (patch) | |
| tree | 9da42ec29de5da50cbe76bd73ccc382c265aa1af /src/emacs.c | |
| parent | 2041ae1fa791f61bf9f4a154de29a7bc167481d6 (diff) | |
| download | emacs-c9628c79bba5ec1e55c31512b5c32371ff034b1f.tar.gz emacs-c9628c79bba5ec1e55c31512b5c32371ff034b1f.tar.bz2 emacs-c9628c79bba5ec1e55c31512b5c32371ff034b1f.zip | |
* configure.ac (file-notification): New option, replaces inotify option.
(HAVE_W32): Remove w32notify.o.
(with_file_notification): Add checks for glib and w32. Adapt check
for inotify.
(Summary): Add entry for file notification.
* autogen/config.in: Add entries for HAVE_GFILENOTIFY,
HAVE_W32NOTIFY and USE_FILE_NOTIFY.
* lisp/autorevert.el (auto-revert-notify-enabled)
(auto-revert-notify-rm-watch, auto-revert-notify-add-watch)
(auto-revert-notify-event-p, auto-revert-notify-event-file-name)
(auto-revert-notify-handler): Handle also gfilenotify.
* lisp/subr.el: (file-notify-handle-event): New defun. Replacing ...
(inotify-event-p, inotify-handle-event, w32notify-handle-event):
Removed.
* src/Makefile.in (NOTIFY_OBJ): New variable.
(base_obj): Replace inotify.o by $(NOTIFY_OBJ).
* src/emacs.c (main): Use HAVE_W32NOTIFY to wrap respective code.
Call syms_of_gfilenotify.
* src/gfilenotify.c: New file.
* src/keyboard.c (Qfile_notify): New variable. Replaces Qfile_inotify
and Qfile_w32notify.
(top): Wrap respective code by HAVE_GFILENOTIFY, HAVE_INOTIFY,
HAVE_W32NOTIFY and USE_FILE_NOTIFY.
* src/lisp.h: Declare syms_of_gfilenotify.
* src/termhooks.h (e): Wrap enum by USE_FILE_NOTIFY.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/emacs.c b/src/emacs.c index 5115126577b..4e439a601b1 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1252,7 +1252,9 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem #ifdef WINDOWSNT globals_of_w32 (); +#ifdef HAVE_W32NOTIFY globals_of_w32notify (); +#endif /* Initialize environment from registry settings. */ init_environment (argv); init_ntproc (dumping); /* must precede init_editfns. */ @@ -1409,6 +1411,10 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem syms_of_gnutls (); #endif +#ifdef HAVE_GFILENOTIFY + syms_of_gfilenotify (); +#endif /* HAVE_GFILENOTIFY */ + #ifdef HAVE_INOTIFY syms_of_inotify (); #endif /* HAVE_INOTIFY */ @@ -1419,7 +1425,9 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem #ifdef WINDOWSNT syms_of_ntterm (); +#ifdef HAVE_W32NOTIFY syms_of_w32notify (); +#endif /* HAVE_W32NOTIFY */ #endif /* WINDOWSNT */ syms_of_profiler (); |