Merge branch 'trunk' into xwidget

Conflicts:
	src/Makefile.in
	src/keyboard.c
	src/termhooks.h

1 files changed, 422 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b1281c17e6..38eb460359c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,414 @@
+2013-06-12  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * fileio.c (expand_file_name): Doc fix.
+
+2013-06-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Tickle glib by waiting for Emacs itself, not for process 0 (Bug#14569).
+        * process.c (init_process_emacs) [HAVE_GLIB && !WINDOWSNT]:
+        Wait for self, not for 0.  This can't hurt on GNU or similar
+        system, and may help with Cygwin.
+
+        * keyboard.c: Don't use PROP (...) as an lvalue.
+        (parse_tool_bar_item) [!USE_GTK && !HAVE_NS]:
+        Use set_prop (A, B), not PROP (A) = B.
+
+2013-06-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (get_it_property): Use it->window instead of generating
+        a Lisp object from it->w.
+
+2013-06-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (get_it_property): If it->object is a buffer, pass to
+        get-char-property the window that is being rendered, instead of
+        the buffer, to support window-specific overlays.  (Bug#14575)
+        (compute_display_string_pos): When W is NULL, use the current
+        buffer as the object to pass to get-char-property.
+        (Fcurrent_bidi_paragraph_direction): Assign NULL to the window
+        pointer member of the bidi iterator, since no window is pertinent
+        to this function.
+
+2013-06-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * bidi.c (bidi_fetch_char): Accept additional argument, the window
+        being displayed, and pass it to compute_display_string_pos.
+        (bidi_level_of_next_char, bidi_resolve_explicit_1)
+        (bidi_paragraph_init): All callers changed.
+
+        * xdisp.c (init_from_display_pos, init_iterator)
+        (handle_single_display_spec, next_overlay_string)
+        (get_overlay_strings_1, reseat_1, reseat_to_string)
+        (push_prefix_prop, Fcurrent_bidi_paragraph_direction):
+        Set bidi_it.w member from it->w.
+        (compute_display_string_pos): Accept additional argument, the
+        window being displayed, and pass it to Fget_char_property.
+        (Bug#14575)
+
+        * dispextern.h (struct bidi_it): New member w, the window being
+        displayed.
+        (compute_display_string_pos): Adjust prototype.
+
+2013-06-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xgselect.c: Remove unneeded include xterm.h.
+
+        * process.c (wait_reading_process_output): Check for NS before GLIB.
+        GLIB may be linked in due to rsvg, but ns_select must be called.
+
+        * xgselect.c (xg_select): Remove call to window_system_available
+        and g_main_context_pending at the top, so Gdk events (i.e. file
+        notify) are processed when Emacs is started with -nw.
+
+2013-06-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (ctagsfiles1, ctagsfiles2): Don't include *.m files.
+        (ctagsfiles3): New variable, includes only *.m files.
+        (TAGS): Use an explicit language name in the regular expressions,
+        to avoid transformation of '/SOMETHING' by MSYS to
+        'c:\MSYS\SOMETHING'.
+
+2013-06-07  Richard Copley  <rcopley@gmail.com>  (tiny change)
+
+        * epaths.in: Fix commentary to PATH_SITELOADSEARCH.
+
+2013-06-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (note_mouse_highlight): When mouse-highlight is off,
+        still need to set the mouse pointer shape and activate help-echo.
+        (Bug#14558)
+
+2013-06-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        A few porting etc. fixes for the new file monitor code.
+        See the thread containing
+        <http://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00109.html>.
+        * gfilenotify.c (dir_monitor_callback, Fgfile_add_watch)
+        (Fgfile_rm_watch): Don't assume EMACS_INT is the same width as a pointer.
+        (dir_monitor_callback, Fgfile_rm_watch):
+        Use assq_no_quit instead of Fassoc, for speed.
+        (dir_monitor_callback, Fgfile_rm_watch):
+        eassert that the monitor is a fixnum.
+        (dir_monitor_callback): No need for CDR_SAFE.
+        Simplify building of lisp with alternative tails.
+        (Fgfile_add_watch, Fgfile_rm_watch):
+        Do not assume glib functions set errno reliably on failure.
+        (Fgfile_add_watch): Check that the monitor survives the XIL trick,
+        and signal an error otherwise.
+        (Fgfile_rm_watch): Prefer CONSP to !NILP.
+        Use Fdelq instead of Fdelete, for speed.
+
+2013-06-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (handle_tool_bar_click): When mouse-highlight is off,
+        don't insist on being invoked on a highlighted tool-bar button.
+        Avoids losing tool-bar functionality when mouse-highlight is nil.
+        (note_tool_bar_highlight, note_mode_line_or_margin_highlight):
+        Don't highlight when mouse-highlight is nil.
+        (note_mouse_highlight): When mouse-highlight is nil, don't return
+        right away; instead, run tool-bar and mode-line highlight
+        subroutine, clear any existing highlight, and revert the mouse
+        pointer to its default shape.  (Bug#14558)
+
+2013-06-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp.mk (lisp): Add prog-mode.el.
+
+2013-06-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Chain glib's SIGCHLD handler from Emacs's (Bug#14474).
+        * process.c (dummy_handler): New function.
+        (lib_child_handler): New static var.
+        (handle_child_signal): Invoke it.
+        (catch_child_signal): If a library has set up a signal handler,
+        save it into lib_child_handler.
+        (init_process_emacs): If using glib and not on Windows, tickle glib's
+        child-handling code so that it initializes its private SIGCHLD handler.
+        * syssignal.h (SA_SIGINFO): Default to 0.
+        * xterm.c (x_term_init): Remove D-bus hack that I installed on May
+        31; it should no longer be needed now.
+
+2013-06-05  Michael Albinus  <michael.albinus@gmx.de>
+
+        * emacs.c (main) [HAVE_GFILENOTIFY]: Call globals_of_gfilenotify.
+
+        * gfilenotify.c (globals_of_gfilenotify): New function.
+        (syms_of_gfilenotify): Move global initialization there.
+
+        * lisp.h (globals_of_gfilenotify) [HAVE_GFILENOTIFY]: Add prototype.
+
+2013-06-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymap.c (Fcurrent_active_maps, Fdescribe_buffer_bindings):
+        * keyboard.c (menu_bar_items, tool_bar_items):
+        * doc.c (Fsubstitute_command_keys): Voverriding_terminal_local_map does
+        not override local keymaps any more.
+
+2013-06-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * window.c (Fpos_visible_in_window_p): Doc fix.  (Bug#14540)
+
+2013-06-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32console.c (initialize_w32_display): Return the dimensions of
+        the console window via 2 additional arguments, not via the current
+        frame.  This avoids crashes due to overrunning the bounds of
+        frame's decode_mode_spec_buffer, which is not resized following
+        the change of the frame dimensions from the initial 10x10.
+
+        * w32term.h (w32_initialize_display_info): Adjust prototype.
+
+        * term.c (init_tty): Take dimensions of the frame from the values
+        returned by initialize_w32_display.
+
+        * Makefile.in (GFILENOTIFY_CFLAGS, GFILENOTIFY_LIBS): New variables.
+        (ALL_CFLAGS): Add $(GFILENOTIFY_CFLAGS).
+        (LIBES): Add $(GFILENOTIFY_LIBS).
+
+        * w32inevt.c (handle_file_notifications): Add dummy implementation
+        for !HAVE_W32NOTIFY.
+
+        * w32term.c: Wrap code with HAVE_W32NOTIFY.
+
+2013-06-03  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xgselect.c: Replace #if defined ... with #ifdef HAVE_GLIB.
+
+        * process.c (wait_reading_process_output): Call xg_select if HAVE_GLIB.
+
+        * Makefile.in (XGSELOBJ): New, xgselect.o if GLib is used, or empty.
+
+2013-06-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix minor problems found by static checking.
+        * data.c (pure_write_error):
+        Use xsignal2, not Fsignal, as Fsignal might return.
+        * eval.c (set_backtrace_debug_on_exit): Now static.
+        (backtrace_p, backtrace_top, backtrace_next, record_in_backtrace):
+        No longer inline.  EXTERN_INLINE is needed only for functions
+        defined in .h files.  Reindent function header as per GNU style.
+        (backtrace_p, backtrace_top, backtrace_next):
+        Mark EXTERNALLY_VISIBLE so they don't get optimized away by the
+        compiler or linker.  Add extern decls to pacify gcc -Wall.
+        * frame.c, frame.h (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource):
+        Now static.
+        * frame.c (free_monitors): Define only on platforms that need it.
+        * nsterm.m (ns_term_init):
+        * process.c (catch_child_signal):
+        Don't worry about whether SIGCHLD is defined, as SIGCHLD is
+        defined on all porting targets these days.
+        * process.c, process.h (catch_child_signal):
+        Make it extern only if NS_IMPL_GNUSTEP is defined.
+
+2013-06-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (gettimeofday): Make the signature identical to prototype
+        in nt/inc/sys/time.h.
+
+2013-06-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * eval.c (backtrace_p, backtrace_top, backtrace_next): Export them to
+        .gdbinit.
+
+        * keyboard.c (safe_run_hooks_error): Improve error message.
+
+        * data.c (pure_write_error): Add `object' argument.
+        * puresize.h (CHECK_IMPURE): Use it.
+
+2013-06-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * Makefile.in (NOTIFY_OBJ): New variable.
+        (base_obj): Replace inotify.o by $(NOTIFY_OBJ).
+
+        * emacs.c (main): Use HAVE_W32NOTIFY to wrap respective code.
+        Call syms_of_gfilenotify.
+
+        * gfilenotify.c: New file.
+
+        * keyboard.c (Qfile_notify): New variable.  Replaces Qfile_inotify
+        and Qfile_w32notify.
+        (top): Wrap respective code by HAVE_GFILENOTIFY, HAVE_INOTIFY,
+        HAVE_W32NOTIFY and USE_FILE_NOTIFY.
+
+        * lisp.h: Declare syms_of_gfilenotify.
+
+        * termhooks.h (e): Wrap enum by USE_FILE_NOTIFY.
+
+2013-06-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Merge the specpdl and backtrace stacks.  Make the structure of the
+        specpdl entries more obvious via a tagged union of structs.
+        * lisp.h (BITS_PER_PTRDIFF_T): New constant.
+        (enum specbind_tag): New enum.
+        (struct specbinding): Make it a tagged union of structs.
+        Add a case for backtrace records.
+        (specpdl_symbol, specpdl_old_value, specpdl_where, specpdl_arg)
+        (specpdl_func, backtrace_function, backtrace_nargs, backtrace_args)
+        (backtrace_debug_on_exit): New accessors.
+        (struct backtrace): Remove.
+        (struct catchtag): Remove backlist field.
+        * data.c (let_shadows_buffer_binding_p, let_shadows_global_binding_p):
+        Move to eval.c.
+        (Flocal_variable_p): Speed up the common case where the binding is
+        already loaded.
+        * eval.c (backtrace_list): Remove.
+        (set_specpdl_symbol, set_specpdl_old_value): Remove.
+        (set_backtrace_args, set_backtrace_nargs)
+        (set_backtrace_debug_on_exit, backtrace_p, backtrace_top)
+        (backtrace_next): New functions.
+        (Fdefvaralias, Fdefvar): Adjust to new specpdl format.
+        (unwind_to_catch, internal_lisp_condition_case)
+        (internal_condition_case, internal_condition_case_1)
+        (internal_condition_case_2, internal_condition_case_n): Don't bother
+        with backtrace_list any more.
+        (Fsignal): Adjust to new backtrace format.
+        (grow_specpdl): Move up.
+        (record_in_backtrace): New function.
+        (eval_sub, Ffuncall): Use it.
+        (apply_lambda): Adjust to new backtrace format.
+        (let_shadows_buffer_binding_p, let_shadows_global_binding_p): Move from
+        data.c.
+        (specbind): Adjust to new specpdl format.  Simplify.
+        (record_unwind_protect, unbind_to): Adjust to new specpdl format.
+        (Fbacktrace_debug, Fbacktrace, Fbacktrace_frame): Adjust to new
+        backtrace format.
+        (mark_backtrace): Remove.
+        (mark_specpdl, get_backtrace, backtrace_top_function): New functions.
+        * xdisp.c (redisplay_internal): Use record_in_backtrace.
+        * alloc.c (Fgarbage_collect): Use record_in_backtrace.
+        Use mark_specpdl.
+        * profiler.c (record_backtrace): Use get_backtrace.
+        (handle_profiler_signal): Use backtrace_top_function.
+        * .gdbinit (xbacktrace, hookpost-backtrace): Use new backtrace
+        accessor functions.
+
+2013-06-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * process.h (catch_child_signal): Declare.
+
+        * process.c (catch_child_signal): New function.
+        (init_process_emacs): Call it.
+
+        * nsterm.m: Include process.h if NS_IMPL_GNUSTEP.
+        (ns_menu_bar_is_hidden, menu_will_open_state): Define only if
+        NS_IMPL_COCOA.
+        (x_set_cursor_type): Remove declaration.
+        (ns_update_begin): Only use r and bp if NS_IMPL_COCOA.
+        (ns_update_end, ns_focus, ns_unfocus): Remove GNUStep specific code.
+        (x_set_window_size): Remove 3 pixels from toolbar if NS_IMPL_GNUSTEP.
+        (ns_get_color): Use F suffix on float.
+        (ns_color_to_lisp, ns_query_color): Use EmacsCGFloat.
+        (ns_get_rgb_color): Remove.
+        (x_set_frame_alpha): Move view inside NS_IMPL_COCOA.
+        (note_mouse_movement): x and y are CGFloat.
+        (ns_draw_fringe_bitmap): Remove unused rowY.
+        Change #if to COCOA && >= 10_6.
+        (ns_draw_window_cursor): Remove unused overspill.
+        (ns_draw_underwave): width and x are EamcsCGFloat.
+        (ns_draw_box): thickness is CGFloat.
+        (ns_dumpglyphs_image): Change #if to COCOA && >= 10_6.
+        (ns_send_appdefined): When NS_IMPL_GNUSTEP, redirect to main thread
+        if not in main thread.
+        (ns_get_pending_menu_title, ns_check_menu_open)
+        (ns_check_pending_open_menu): Put inside #if COCOA && >= 10_5.
+        (ns_term_init): Call catch_child_signal if NS_IMPL_GNUSTEP && SIGCHLD.
+        (sendFromMainThread:): New method.
+        (changeFont:): size is CGFloat.
+        (keyDown:): Check for Delete when NS_IMPL_GNUSTEP.
+        Disable warning about permanent text.
+        (characterIndexForPoint:): Adjust return type depending on GNUStep
+        version.
+        (mouseDown:): delta is CGFloat.
+        (updateFrameSize): Remove unised variable f.
+        (initFrameFromEmacs): Move toggleButton inside NS_IMPL_COCOA.
+        Cast float to EmacsCGFloat.
+        (windowWillUseStandardFrame:defaultFrame:): Set maximized_height
+        also to -1 when restoring.
+        (windowDidExitFullScreen:): Put call to updateCollectionBehaviour
+        inside NS_IMPL_COCOA.
+        (toggleFullScreen:): Put call to toggleFullScreen inside
+        NS_IMPL_COCOA.  Cast float to EmacsCGFloat.
+        (setPosition:portion:whole:): por is CGFloat.
+        (getMouseMotionPart:window:x:y:): Add F suffix to float.
+        (mouseDown:): Use CGFloat.
+        (mouseDragged:): Remove unised variable edge.
+        (EmacsDocument): Implement for NS_IMPL_GNUSTEP.
+
+        * nsterm.h (EmacsCGFloat): Typedef for OSX and GNUStep when the size
+        of CGFloat differs.
+        (EmacsApp): New variable nextappdefined.  Declare sendFromMainThread
+        when NS_IMPL_GNUSTEP.
+        (EmacsDocument): Declare when NS_IMPL_GNUSTEP.
+        (EmacsView): Remove unlockFocusNeedsFlush, add windowDidMove.
+        (EmacsToolbar): Add clearAll.  Add tag argument to
+        addDisplayItemWithImage.
+        (EmacsSavePanel, EmacsOpenPanel): Remove getFilename and getDirectory.
+
+        * nsselect.m (ns_get_local_selection): Remove unused variable type.
+
+        * nsmenu.m (ns_update_menubar): Make static.
+        (x_activate_menubar): Surround with ifdef NS_IMPL_COCOA
+        (fillWithWidgetValue:): Add cast to SEL for setAction.
+        (addSubmenuWithTitle:forFrame:): Add cast to SEL for action.
+        (update_frame_tool_bar): Update code for GNUStep.
+        (clearAll): New method.
+        (addDisplayItemWithImage:idx:tag:helpText:enabled:): Handle new tag
+        argument. Call insertItemWithItemIdentifier when NS_IMPL_GNUSTEP.
+        Move identifierToItem setObject and activeIdentifiers addObject before
+        call to insertItemWithItemIdentifier.
+        (validateVisibleItems): Fix indentation.
+        (toolbarAllowedItemIdentifiers:): Return activeIdentifiers.
+        (initWithContentRect:styleMask:backing:defer:): Add ClosableWindow and
+        UtilityWindow to aStyle, remove call to setStyleMask.
+
+        * nsimage.m (setXBMColor:, getPixelAtX:Y:): Use EmacsCGFloat.
+
+        * nsfont.m (ns_attribute_fvalue, ns_spec_to_descriptor)
+        (ns_charset_covers, ns_get_covering_families, nsfont_open):
+        Use F suffix on floats.
+        (ns_char_width): Returns CGFloat.
+        (ns_ascii_average_width): w is CGFloat instead of float.
+        (nsfont_draw): cbuf and c are unsigned.  Cast to char* in call to
+        DPSxshow.
+        (ns_glyph_metrics): CGFloat instead of float.
+
+        * nsfns.m (x_set_foreground_color, x_set_background_color):
+        Use EmacsCGFloat.
+        (ns_implicitly_set_icon_type, Fx_create_frame): Make static,
+        remove unused variables.
+        (Fns_read_file_name): Keep track if panel is for save.
+        Use ns_filename_from_panel/ns_directory_from_panel.
+        (Fns_list_services): delegate only used for COCOA.
+        (Fns_convert_utf8_nfd_to_nfc): Remove warning for GNUStep.
+        Just return the input if GNUStep.
+        (x_screen_planes): Remove.
+        (Fxw_color_values): Use EmacsCGFloat
+        (Fns_display_monitor_attributes_list): Only get screen number for
+        Cocoa.
+        (getDirectory, getFilename): Removed from EmacsOpenPanel and
+        EmacsSavePanel.
+        (EmacsOpenPanel:ok:): Use ns_filename_from_panel and
+        ns_directory_from_panel.
+
+2013-06-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * process.c (handle_child_signal): Also use WCONTINUED.
+        This is so that list-processes doesn't mistakenly list the process
+        as stopped, when the process has actually been continued and is
+        now running.
+
+2013-05-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Don't let D-bus autolaunch mess up SIGCHLD handling (Bug#14474).
+        * xterm.c (x_term_init): Inhibit D-Bus autolaunch if D-Bus is
+        not already configured.
+
+        * fileio.c (Finsert_file_contents): Remove unused local (Bug#8447).
+
+2013-05-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (mostlyclean): Remove *.res files.
+
 2013-05-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * fileio.c (Finsert_file_contents): Preserve undo info when reverting
@@ -85,7 +496,7 @@
 2013-05-21  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * xdisp.c (reseat_at_previous_visible_line_start):
-        Already declared in dispextern.h, so remove it here.
+        Already declared in dispextern.h, so remove it here.
         (move_it_vertically_backward): Likewise.
 
 2013-05-20  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
@@ -96,7 +507,7 @@
         Mention `display-monitor-attributes-list' in docstrings.
 
         * nsfns.m (ns_get_screen): Remove function.  All uses removed.
-        (check_ns_display_info): Sync with check_x_display_info in xfns.c.
+        (check_ns_display_info): Sync with check_x_display_info in xfns.c.
         (Fx_server_max_request_size, Fx_server_vendor, Fx_server_version)
         (Fx_display_screens, Fx_display_mm_width, Fx_display_mm_height)
         (Fx_display_backing_store, Fx_display_visual_class)
@@ -252,7 +663,7 @@
 
 2013-05-07  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
+        Use Gnulib ACL implementation, for benefit of Solaris etc.  (Bug#14295)
         * Makefile.in (LIB_ACL): New macro.
         (LIBACL_LIBS): Remove.
         (LIBES): Use LIB_ACL, not LIBACL_LIBS.
@@ -2685,11 +3096,10 @@
 2012-12-31  Adam Sjøgren  <asjo@koldfront.dk>  (tiny change)
 
         * xterm.c (scroll-bar-adjust-thumb-portion): New variable to
-        determine whether scroll bar thumb size should be adjusted or
-        not. Use variable for MOTIF.
+        determine whether scroll bar thumb size should be adjusted or not.
+        Use variable for MOTIF.
 
-        * gtkutil.c (scroll-bar-adjust-thumb-portion): Use variable for
-        GTK.
+        * gtkutil.c (scroll-bar-adjust-thumb-portion): Use variable for GTK.
 
 2013-01-13  Jan Djärv  <jan.h.d@swipnet.se>
 
@@ -3234,7 +3644,7 @@
 
 2012-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Fix permissions bugs with setgid directories etc. (Bug#13125)
+        Fix permissions bugs with setgid directories etc.  (Bug#13125)
         * dired.c (Ffile_attributes): Return t as the 9th attribute,
         to mark it as a placeholder.  The old value was often wrong.
         The only user of this attribute has been changed to use
@@ -3534,7 +3944,7 @@
         Use xputenv instead of setenv or putenv, to detect memory exhaustion.
         * editfns.c (initial_tz): Move static var decl up.
         (tzvalbuf_in_environ): New static var.
-        (init_editfns): Initialize these two static vars.
+        (init_editfns): Initialize these two static vars.
         (Fencode_time): Don't assume arbitrary limit on EMACS_INT width.
         Save old TZ value on stack, if it's small.
         (Fencode_time, set_time_zone_rule): Don't modify 'environ' directly;
@@ -3813,7 +4223,7 @@
         Use execve to avoid need to munge environ (Bug#13054).
         * callproc.c (Fcall_process):
         * process.c (create_process):
-        Don't save and restore environ; no longer needed.
+        Don't save and restore environ; no longer needed.
         * callproc.c (child_setup):
         Use execve, not execvp, to preserve environ.
 
@@ -4335,7 +4745,7 @@
         * w32term.c (x_window_to_scroll_bar): Likewise.
         * window.c (window_list): Likewise.
         * xdisp.c (x_consider_frame_title): Likewise.
-        * xfaces.c ( Fdisplay_supports_face_attributes_p): Likewise.
+        * xfaces.c (Fdisplay_supports_face_attributes_p): Likewise.
         * xfns.c (x_window_to_frame, x_any_window_to_frame)
         (x_menubar_window_to_frame, x_top_window_to_frame): Likewise.
         * xmenu.c (menubar_id_to_frame): Likewise.
@@ -17567,7 +17977,7 @@
 
         Fix memory allocation problems in Cygwin build (Bug#9273).
 
-        * unexcw.c ( __malloc_initialized): Declare external variable.
+        * unexcw.c (__malloc_initialized): Declare external variable.
         (fixup_executable): Force the dumped emacs to reinitialize malloc.
 
         * gmalloc.c [CYGWIN] (bss_sbrk_heapbase, bss_sbrk_heapinfo):