[Emacs-diffs] /srv/bzr/emacs/trunk r111177: Merge from private trunk

[dancol]

------------------------------------------------------------
revno: 111177 [merge]
committer: address@hidden
branch nick: realtrunk
timestamp: Mon 2012-12-10 12:55:02 -0800
message:
  Merge from private trunk
  
  Daniel Colascione 2012-12-10 Add emacs.res to .bzrignore
  Daniel Colascione 2012-12-10 Fix cygw32 build break
modified:
  .bzrignore
  ChangeLog
  src/ChangeLog
  src/keyboard.c
  src/w32term.c

=== modified file '.bzrignore'
--- a/.bzrignore        2012-11-14 04:55:41 +0000
+++ b/.bzrignore        2012-12-10 20:47:57 +0000
@@ -153,6 +153,7 @@
 src/prefix-args*
 src/stamp-oldxmenu
 src/stamp-h.in
+src/emacs.res
 src/temacs
 test/indent/*.new
 +*

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-12-10 20:27:33 +0000
+++ b/ChangeLog 2012-12-10 20:55:02 +0000
@@ -6,6 +6,8 @@
 
 2012-12-10  Daniel Colascione  <address@hidden>
 
+       * .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.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-10 17:52:35 +0000
+++ b/src/ChangeLog     2012-12-10 20:46:20 +0000
@@ -1,5 +1,8 @@
 2012-12-10  Daniel Colascione  <address@hidden>
 
+       * 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.
 

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2012-12-10 12:08:02 +0000
+++ b/src/keyboard.c    2012-12-10 20:46:20 +0000
@@ -3909,6 +3909,8 @@
                              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 @@
 
 #ifdef HAVE_NTGUI
   DEFSYM (Qlanguage_change, "language-change");
+#endif
+
+#ifdef WINDOWSNT
   DEFSYM (Qfile_w32notify, "file-w32notify");
 #endif
 

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2012-12-10 12:08:02 +0000
+++ b/src/w32term.c     2012-12-10 20:46:20 +0000
@@ -3244,6 +3244,7 @@
   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 @@
   /* 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 @@
          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.  */