From: Eli Zaretskii Date: Wed, 17 Oct 2012 21:07:59 +0000 (+0200) Subject: Merge from trunk. X-Git-Tag: emacs-24.3.90~173^2~7^2~663 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8cd879af4a393715c1c7f44a174248e85f7810ab;p=emacs.git Merge from trunk. --- 8cd879af4a393715c1c7f44a174248e85f7810ab diff --cc src/ChangeLog index b573f8c1476,827850e332d..007a73f7988 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -460,73 -559,39 +559,73 @@@ but it still has blocs in it, don't return it to the system, instead of aborting. (Bug#12402) + 2012-10-07 Jan Djärv + + * nsterm.m (ns_dumpglyphs_image): Only draw slice of image (Bug#12506). + + * nsterm.m (ns_update_auto_hide_menu_bar): Remove defintion of + MAC_OS_X_VERSION_10_6. + (syms_of_nsterm): Remove comment about Panther and above for + ns-antialias-text. + * nsterm.h (MAC_OS_X_VERSION_10_3, onTiger): Remove. + (EmacsApp): Remove check for >= MAC_OS_X_VERSION_10_4. + (struct nsfont_info): Remove check for >= MAC_OS_X_VERSION_10_3. + + * nsselect.m (ns_string_from_pasteboard): Remove check for >= + MAC_OS_X_VERSION_10_4. + + * nsmenu.m (fillWithWidgetValue:): Remove code for < + MAC_OS_X_VERSION_10_2. + + * nsimage.m (setPixmapData, getPixelAtX, setAlphaAtX): Remove onTiger. + + * nsfns.m (Fns_list_services): Remove comment and check for OSX < 10.4. + (ns_do_applescript): Remove check for >= MAC_OS_X_VERSION_10_4. + + * nsterm.m (ns_in_resize): Remove (Bug#12479). + (ns_resize_handle_rect, mouseDown, mouseUp, mouseDragged): Remove. + (ns_clear_frame, sendEvent, windowDidResize, drawRect:): + Remove ns_in_resize check. + (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. + +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 Jan Djärv - - * nsterm.m (ns_dumpglyphs_image): Only draw slice of image (Bug#12506). - - * nsterm.m (ns_update_auto_hide_menu_bar): Remove defintion of - MAC_OS_X_VERSION_10_6. - (syms_of_nsterm): Remove comment about Panther and above for - ns-antialias-text. - * nsterm.h (MAC_OS_X_VERSION_10_3, onTiger): Remove. - (EmacsApp): Remove check for >= MAC_OS_X_VERSION_10_4. - (struct nsfont_info): Remove check for >= MAC_OS_X_VERSION_10_3. - - * nsselect.m (ns_string_from_pasteboard): Remove check for >= - MAC_OS_X_VERSION_10_4. - - * nsmenu.m (fillWithWidgetValue:): Remove code for < - MAC_OS_X_VERSION_10_2. - - * nsimage.m (setPixmapData, getPixelAtX, setAlphaAtX): Remove onTiger. - - * nsfns.m (Fns_list_services): Remove comment and check for OSX < 10.4. - (ns_do_applescript): Remove check for >= MAC_OS_X_VERSION_10_4. - - * nsterm.m (ns_in_resize): Remove (Bug#12479). - (ns_resize_handle_rect, mouseDown, mouseUp, mouseDragged): Remove. - (ns_clear_frame, sendEvent, windowDidResize, drawRect:): Remove - ns_in_resize check. - (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. - 2012-10-07 Paul Eggert Improve sys_siglist detection. diff --cc src/w32term.h index 91723c3758a,af5b37a1171..94ef9624351 --- a/src/w32term.h +++ b/src/w32term.h @@@ -682,13 -681,10 +682,17 @@@ extern BOOL parse_button (int, int, in extern void w32_sys_ring_bell (struct frame *f); extern void x_delete_display (struct w32_display_info *dpyinfo); ++ +extern int notification_buffer_in_use; +extern BYTE file_notifications[16384]; +extern DWORD notifications_size; +extern void *notifications_desc; +extern Lisp_Object w32_get_watch_object (Lisp_Object); +extern Lisp_Object lispy_file_action (DWORD); + + extern void w32_initialize_display_info (Lisp_Object); + extern void initialize_w32_display (struct terminal *); + - /* Keypad command key support. W32 doesn't have virtual keys defined for the function keys on the keypad (they are mapped to the standard function keys), so we define our own. */