procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from private trunk

Browse source 
Daniel Colascione 2012-12-10 Add emacs.res to .bzrignore
Daniel Colascione 2012-12-10 Fix cygw32 build break
This commit is contained in:
Daniel Colascione 2012-12-10 12:55:02 -08:00
commit 5b55e0b70f
4 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -6,6 +6,8 @@
2012-12-10 Daniel Colascione <dancol@dancol.org>
* .bzrignore: add src/emacs.res.
* configure.ac (W32_RES, W32_RES_LINK, WINDRES): Teach the cygw32
build how to compile Windows resource files; use these variables
to tell src/Makefile.in how and whether to compile resources.

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2012-12-10 Daniel Colascione <dancol@dancol.org>
* w32term.c, keyboard.c: Fix build break in cygw32 by omitting
Windows file notification functionality unless WINDOWSNT.
* w32gui.h (hprevinst, lpCmdLine, nCmdShow): Remove unused
declarations.

5
src/keyboard.c
View file

@ -3909,6 +3909,8 @@ kbd_buffer_get_event (KBOARD **kbp,
make_number (event->modifiers)));
kbd_fetch_ptr = event + 1;
}
#endif
#ifdef WINDOWSNT
else if (event->kind == FILE_NOTIFY_EVENT)
{
/* Make an event (file-notify (DESCRIPTOR ACTION FILE) CALLBACK). */
@ -11361,6 +11363,9 @@ syms_of_keyboard (void)
#ifdef HAVE_NTGUI
DEFSYM (Qlanguage_change, "language-change");
#endif
#ifdef WINDOWSNT
DEFSYM (Qfile_w32notify, "file-w32notify");
#endif

4
src/w32term.c
View file

@ -3244,6 +3244,7 @@ lispy_file_action (DWORD action)
return retval;
}
#ifdef WINDOWSNT
/* Put file notifications into the Emacs input event queue. This
function runs when the WM_EMACS_FILENOTIFY message arrives from a
watcher thread. */
@ -3320,6 +3321,7 @@ queue_notifications (struct input_event *event, W32Msg *msg, struct frame *f,
/* We've stuffed all the events ourselves, so w32_read_socket shouldn't. */
event->kind = NO_EVENT;
}
#endif
/* Function to report a mouse movement to the mainstream Emacs code.
@ -4954,11 +4956,13 @@ w32_read_socket (struct terminal *terminal,
check_visibility = 1;
break;
#ifdef WINDOWSNT
case WM_EMACS_FILENOTIFY:
f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
if (f)
queue_notifications (&inev, &msg, f, &count);
break;
#endif
default:
/* Check for messages registered at runtime. */