From: Eli Zaretskii Date: Fri, 2 Nov 2012 09:00:44 +0000 (+0200) Subject: Merge from trunk after 24.3 was moved to emacs-24 branch. X-Git-Tag: emacs-24.3.90~173^2~7^2~655 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5ade42a5114255c43117065494b96d480c1e1588;p=emacs.git Merge from trunk after 24.3 was moved to emacs-24 branch. --- 5ade42a5114255c43117065494b96d480c1e1588 diff --cc src/ChangeLog index c81009928de,e762eb13b87..87f669c5c6e --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -628,43 -789,9 +789,43 @@@ (ns_clear_frame_area): Remove resize handle code. * nsfns.m (ns_in_resize): Remove. - (x_set_icon_name, ns_set_name, ns_set_name_as_filename): Remove - ns_in_resize check. + (x_set_icon_name, ns_set_name, ns_set_name_as_filename): + Remove ns_in_resize check. +2012-10-07 Eli Zaretskii + + * w32term.h (WM_EMACS_FILENOTIFY): New custom message. + (WM_EMACS_END): Bump value by 1. + + * w32term.c (lispy_file_action, queue_notifications): New functions. + (syms_of_w32term) + : New symbols. + + * w32notify.c: New file, implement file event notifications for + MS-Windows. + + * w32fns.c (w32_wnd_proc): Handle the WM_EMACS_FILENOTIFY message + by posting it to the w32_read_socket queue. + + * termhooks.h (enum event_kind) [WINDOWSNT]: New event kind + FILE_NOTIFY_EVENT. + + * makefile.w32-in (OBJ2): Add $(BLD)/w32notify.$(O). + (GLOBAL_SOURCES): Add w32notify.c + ($(BLD)/w32notify.$(O)): New set of dependencies. + + * lisp.h (syms_of_w32notify) [WINDOWSNT]: Add prototype. + + * keyboard.c (kbd_buffer_get_event) [WINDOWSNT]: Handle + FILE_NOTIFY_EVENT. + (syms_of_keyboard) [WINDOWSNT] : New symbol. + (keys_of_keyboard) [WINDOWSNT]: Bind file-notify to + w32notify-handle-event by default. + + * emacs.c (main) [WINDOWSNT]: Call syms_of_w32notify. + + * alloc.c (NSTATICS): Enlarge to 0x660. + 2012-10-07 Paul Eggert Improve sys_siglist detection.