* src/frame.c (syms_of_frame) <tool-bar-mode>:
Default to nil if !HAVE_WINDOW_SYSTEM.
* lisp/cus-start.el: Handle standard values via a keyword.
Only set version property if specified.
(cursor-in-non-selected-windows, menu-bar-mode)
(tool-bar-mode, show-trailing-whitespace):
Do not specify standard values.
(transient-mark-mode, temporary-file-directory): Use :standard.
* xterm.c (x_connection_closed): Print informative error message
when aborting on GTK. This requires using shut_down_emacs
directly instead of Fkill_emacs.
emacs.c (main): Call syms_of_filelock unconditionally.
filelock.c (syms_of_filelock): Move out of #ifdef CLASH_DETECTION
clause, but keep part of it conditioned on CLASH_DETECTION.
(Fdbus_register_signal, Fdbus_register_method): Check, whether
`dbus-registered-objects-table' is initialized.
Must not be synchronized with the trunk.
xdisp.c (fast_find_string_pos): #ifdef away, not used anymore.
(mouse_face_from_string_pos): New function, replaces
fast_find_string_pos.
(note_mouse_highlight): Call it instead of fast_find_string_pos.
(note_mode_line_or_margin_highlight): Support bidi-reordered
strings and R2L glyph rows. Fix comments.
(note_mouse_highlight): When bidi reordering is turned on in a
buffer, call next-single-property-change and
previous-single-property-change with last argument nil. Clear
mouse highlight when mouse pointer is in a R2L row on the stretch
glyph that stands for no text beyond the line end.
(row_containing_pos): Don't return too early when CHARPOS is in a
bidi-reordered continued line. Return immediately when the first
hit is found in a line that is not continued, or when an exact
match for CHARPOS is found.
(rows_from_pos_range): New function.
(mouse_face_from_buffer_pos): Use it instead of calling
row_containing_pos for START_CHARPOS and END_CHARPOS. Rewrite the
function to support mouse highlight in bidi-reordered lines and
not to assume that START_CHARPOS is always in mouse_face_beg_row.
If necessary, swap mouse_face_beg_row and mouse_face_end_row so
that the former is always above the latter or identical to it.
(show_mouse_face): Support drawing highlighted R2L lines.
(coords_in_mouse_face_p): New function, bidi-aware.
(cursor_in_mouse_face_p, note_mouse_highlight, erase_phys_cursor):
Call it instead of comparing with mouse-face members of dpyinfo.
(note_mode_line_or_margin_highlight): Fix confusingly swapped
usage of hpos and vpos.
xdisp.c (mouse_face_from_string_pos): Initialize the `found'
flag to zero, and exit the outer loop when it's non-zero. Bail
our early if no row in the window belongs to the highlighted
string. Always back up after exiting the second loop.
src/frame.c (Fframep, Fwindow_system): Deprecate use as a predicate.
Document all values.
src/dispnew.c (syms_of_display) <initial-window-system, window-system>:
Deprecate use as a boolean flag. Document all values.
src/display.texi (Window Systems): Deprecate use of window-system as
a predicate.
* src/xfns.c: Include Xm/TextF and Xm/List.
(file_dialog_cb, file_dialog_unmap_cb, clean_up_file_dialog): Make
ANSI prototypes.
* src/xmenu.c: Revert 2010-07-27 change: lwlib.h is needed for
MOTIF (Bug#7263).
* src/xrdb.c: Include keyboard.h for MOTIF.