Merge from trunk.

diff --cc ChangeLog
index 845fce543b6cdeea4d7b187fce34f04960a725ce,d04d7e2e279d45010d232590e4288cf89b5f4a1d..1a25ba8e33d675a1084f22d6456646ca624a1cf5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,7 +1,21 @@@
  2011-07-08  Paul Eggert  <eggert@cs.ucla.edu>
  
 +      Add gnulib support for pthread_sigmask (Bug#9010).
 +      * Makefile.in (GNULIB_MODULES): Add pthread_sigmask.
 +      * configure.in (AC_TYPE_UID_T): New dummy macro.
 +      Configure gnulib after adjusting LIBS,
 +      so that gnulib can assume the libraries in LIBS.
 +      * lib/signal.in.h, m4/pthread_sigmask.m4, m4/signal_h.m4:
 +      * lib/pthread_sigprocmask.c, lib/sigprocmask.c, m4/signalblocking.m4:
 +      New files, automatically imported from gnulib.
 +      * lib/gnulib.mk, m4/gl-comp.m4: Automatically-imported update
 +      due to the above changes.
 +      * .bzrignore: Add lib/signal.h.
 +      * src/Makefile.in (LIB_PTHREAD_SIGMASK): New macro.
 +      (LIBES): Use it.
 +
+       * lib/getopt.c, lib/unistd.in.h, m4/getopt.m4: Merge from gnulib.
+ 
  2011-07-07  Andreas Schwab  <schwab@linux-m68k.org>
  
        * configure.in (maintainer-mode): Reflect default in help string.

diff --cc src/ChangeLog
index ccafc9c5963b15dcb69d6c2005b54f60ede81d5b,52b6bf15e1d4a2a51063818d7f466adfa2e5bfcc..bd250886ad0e128c4b630b52b725ff1ce89bf50f
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,14 -1,54 +1,63 @@@
 +2011-07-08  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Use pthread_sigmask, not sigprocmask (Bug#9010).
 +      * callproc.c (Fcall_process):
 +      * sysdep.c (sys_sigblock, sys_sigunblock, sys_sigsetmask):
 +      * process.c (create_process):
 +      sigprocmask is portable only for single-threaded applications, and
 +      Emacs can be multi-threaded when it uses GTK.
 +
  2011-07-08  Jan Djärv  <jan.h.d@swipnet.se>
  
+       * gtkutil.c (qttip_cb): Set line wrap to FALSE for tooltip widget.
+       (xg_prepare_tooltip): Revert text in x->ttip_lbl, margins was
+       wrong (Bug#8591).
+ 
+ 2011-07-08  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * gtkutil.c (xg_prepare_tooltip): Fix indentation and comment.
+       Put text in x->ttip_lbl instead of gtk_tooltip_set_text (Bug#8591).
+       (xg_hide_tooltip): Fix comment.
+ 
+       * nsterm.m (initFrameFromEmacs): Don't use ns_return_types
+       in registerServicesMenuSendTypes.
+       (validRequestorForSendType): Don't check ns_return_types.
+ 
+       * nsfns.m (Fx_open_connection): Put NSStringPboardType into
+       ns_return_type.
+ 
+ 2011-07-08  Jason Rumney  <jasonr@gnu.org>
+ 
+       * w32fns.c (w32_wnd_proc) [WM_TIMER, WM_SET_CURSOR]: Avoid using
+       frame struct members of non-existent frames (Bug#6284).
+ 
+ 2011-07-08  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * nsterm.m (keyDown): Call to wantsToDelayTextChangeNotifications and
+       variable firstTime not needed on OSX >= 10.6.
+       (setPosition): setFloatValue:knobProportion: is deprecated on OSX
+       >= 10.5.  Use setKnobProportion, setDoubleValue.
+ 
+       * nsterm.h (MAC_OS_X_VERSION_10_3, MAC_OS_X_VERSION_10_4)
+       (MAC_OS_X_VERSION_10_5): Define if not defined.
+       (EmacsView, EmacsTooltip): Implements NSWindowDelegate on OSX >= 10.6.
+       (EmacsMenu): Implements NSMenuDelegate on OSX >= 10.6.
+       (EmacsToolbar): Implements NSToolbarDelegate on OSX >= 10.6.
+ 
+       * nsselect.m (ns_string_from_pasteboard): Don't use deprecated methods
+       cString and lossyCString on OSX >= 10.4
+ 
+       * nsmenu.m (fillWithWidgetValue): Don't use depercated method
+       sizeToFit on OSX >= 10.2.
+ 
+       * nsimage.m (allocInitFromFile): Don't use deprecated method
+       bestRepresentationForDevice on OSX >= 10.6.
+ 
+       * nsfns.m (check_ns_display_info): Cast to long and use %ld in error
+       to avoid warning.
+ 
+       * emacs.c: Declare unexec_init_emacs_zone.
+ 
        * nsgui.h: Fix compiler warning about gnulib redefining verify.
  
        * nsselect.m (ns_get_local_selection): Change to extern (Bug#8842).