From: Paul Eggert Date: Fri, 8 Jul 2011 09:38:32 +0000 (-0700) Subject: Merge from trunk. X-Git-Tag: emacs-pretest-24.0.90~104^2~419^2~2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1692ae2dd5ff8f6f1fc6f6f62b9a44ab7e615615;p=emacs.git Merge from trunk. --- 1692ae2dd5ff8f6f1fc6f6f62b9a44ab7e615615 diff --cc ChangeLog index 62847460778,217e1d30ff5..6aaebbc80e9 --- a/ChangeLog +++ b/ChangeLog @@@ -1,17 -1,11 +1,25 @@@ - 2011-07-06 Paul Eggert ++2011-07-08 Paul Eggert + + Add gnulib support for pthread_sigmask (Bug#9010). + * Makefile.in (GNULIB_MODULES): Add pthread_sigmask. + (GNULIB_TOOL_FLAGS): Avoid sigprocmask. Emacs does its own + implementation of 'sigprocmask' on Windows, and it assumes + 'sigprocmask' on non-Windows hosts, so it doesn't need the + sigprocmask module. + * lib/signal.in.h, m4/pthread_sigmask.m4, m4/signal_h.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. + + 2011-07-07 Andreas Schwab + + * configure.in (maintainer-mode): Reflect default in help string. + + 2011-07-07 Dan Nicolaescu + + * configure.in: Remove reference to iris4d.h. + 2011-07-05 Jan Djärv * configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS. diff --cc src/ChangeLog index 41dd4c0e9c1,3c718c078d3..ccafc9c5963 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,12 -1,108 +1,117 @@@ - 2011-07-06 Paul Eggert ++2011-07-08 Paul Eggert + + 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 + + * nsgui.h: Fix compiler warning about gnulib redefining verify. + + * nsselect.m (ns_get_local_selection): Change to extern (Bug#8842). + + * nsmenu.m (ns_update_menubar): Remove useless setDelegate call + on svcsMenu (Bug#8842). + + * nsfns.m (Fx_open_connection): Remove NSStringPboardType from + ns_return_types. + (Fns_list_services): Just return Qnil on 10.6, code not working there. + + * nsterm.m (QUTF8_STRING): Declare. + (initFrameFromEmacs): Call registerServicesMenuSendTypes. + (validRequestorForSendType): Return type is (id). + Change indexOfObjectIdenticalTo to indexOfObject. + Check if we have local selection before returning self (Bug#8842). + (writeSelectionToPasteboard): Put local selection into paste board + if we have a local selection (Bug#8842). + (syms_of_nsterm): DEFSYM QUTF8_STRING. + + * nsterm.h (MAC_OS_X_VERSION_10_6): Define here instead of nsterm.m. + (ns_get_local_selection): Declare. + + 2011-07-07 Lars Magne Ingebrigtsen + + * keymap.c (describe_map_tree): Don't insert a double newline at + the end of the buffer (bug#1169) and return whether we inserted + something. + + * callint.c (Fcall_interactively): Change "reading args" to + "providing args" to try to clarify what it does (bug#1010). + + 2011-07-07 Kenichi Handa + + * composite.c (composition_compute_stop_pos): Ignore a static + composition starting before CHARPOS (Bug#8915). + + * xdisp.c (handle_composition_prop): Likewise. + + 2011-07-07 Eli Zaretskii + + * term.c (produce_glyphs) : Allow IT_GLYPHLESS in it->what. + (Bug#9015) + + 2011-07-07 Kenichi Handa + + * character.h (unicode_category_t): New enum type. + + * chartab.c (uniprop_decoder_t, uniprop_encoder_t): New types. + (Qchar_code_property_table): New variable. + (UNIPROP_TABLE_P, UNIPROP_GET_DECODER) + (UNIPROP_COMPRESSED_FORM_P): New macros. + (char_table_ascii): Uncompress the compressed values. + (sub_char_table_ref): New arg is_uniprop. Callers changed. + Uncompress the compressed values. + (sub_char_table_ref_and_range): Likewise. + (char_table_ref_and_range): Uncompress the compressed values. + (sub_char_table_set): New arg is_uniprop. Callers changed. + Uncompress the compressed values. + (sub_char_table_set_range): Args changed. Callers changed. + (char_table_set_range): Adjuted for the above change. + (map_sub_char_table): Delete args default_val and parent. Add arg + top. Give decoded values to a Lisp function. + (map_char_table): Adjusted for the above change. Give decoded + values to a Lisp function. Gcpro more variables. + (uniprop_table_uncompress) + (uniprop_decode_value_run_length): New functions. + (uniprop_decoder, uniprop_decoder_count): New variables. + (uniprop_get_decoder, uniprop_encode_value_character) + (uniprop_encode_value_run_length, uniprop_encode_value_numeric): + New functions. + (uniprop_encoder, uniprop_encoder_count): New variables. + (uniprop_get_encoder, uniprop_table) + (Funicode_property_table_internal, Fget_unicode_property_internal) + (Fput_unicode_property_internal): New functions. + (syms_of_chartab): DEFSYM Qchar_code_property_table, defsubr + Sunicode_property_table_internal, Sget_unicode_property_internal, + and Sput_unicode_property_internal. Defvar_lisp + char-code-property-alist. + + * composite.c (CHAR_COMPOSABLE_P): Adjusted for the change of + Vunicode_category_table. + + * font.c (font_range): Adjusted for the change of + Vunicode_category_table. + + 2011-07-07 Dan Nicolaescu + + * m/iris4d.h: Remove file, move contents ... + * s/irix6-5.h: ... here. + + 2011-07-06 Paul Eggert + + Remove unportable assumption about struct layout (Bug#8884). + * alloc.c (mark_buffer): + * buffer.c (reset_buffer_local_variables, Fbuffer_local_variables) + (clone_per_buffer_values): Don't assume that + sizeof (struct buffer) is a multiple of sizeof (Lisp_Object). + This isn't true in general, and it's particularly not true + if Emacs is configured with --with-wide-int. + * buffer.h (FIRST_FIELD_PER_BUFFER, LAST_FIELD_PER_BUFFER): + New macros, used in the buffer.c change. + 2011-07-05 Jan Djärv * xsettings.c: Use both GConf and GSettings if both are available.