merge trunk
composite.c (composition_update_it): Fix indexing of LGSTRING_CHAR (Bug#15984).
merge trunk
composite.c (composition_update_it): Fix indexing of LGSTRING_CHAR (Bug#15984).
* lisp/net/shr.el (shr-render-region): Autoload.
Make GTK+ menus work correctly with Unity global menu
Fix changelog
Make GTK+ menus work correctly with the Unity global menu
* lisp/indent.el (indent-according-to-mode): Flush to column 0 in text-mode
after an empty line.
fit-frame/window-to-buffer code fixes including one for Bug#14096.

* window.el (fit-frame-to-buffer): Fix doc-string.  Respect
window-min-height/-width.  Fit pixelwise when
frame-resize-pixelwise is non-nil.  Adjust right/bottom edge
when avoiding that frame goes partially off-screen.
(fit-window-to-buffer): Respect window-min-height/-width
(Bug#14096).
* lisp/info.el (Info-find-file): Go to DIR before displaying the error
about a nonexistent file if no previous Info file is visited.
Use `user-error' instead of `error' for "Info file %s does not exist".
(Info-find-node-2): In case of a nonexistent node in unwind forms
go to the Top node if there is no previous node to revert to.
* macfont.m: Include termchar.h.
(CG_SET_FILL_COLOR_WITH_FACE_FOREGROUND)
(CG_SET_FILL_COLOR_WITH_FACE_BACKGROUND)
(CG_SET_STROKE_COLOR_WITH_FACE_FOREGROUND): Modified from
*_WITH_GC_* to take face and f as parameters.
(macfont_draw): Check for DRAW_MOUSE_FACE and set face accordingly.
Use *_WITH_FACE_*, and pass face as parameter.
Bug#13064

* automated/ert-tests.el (ert-test-record-backtrace): Reenable
test case with adapted test string.  (Bug#13064)
Partially fix Bug#16403.

* rect.el (rectangle-mark-mode): When the region is not active,
display a message saying that the mark as been set and that
rectangle mode is in use.
(rectangle--highlight-for-redisplay): Only put an overlay with a
visible vertical bar when (display-graphic-p) is non-nil.
This partially fixes Bug#16403.
Fix bug when resizing mini window (Bug#16424).

* xdisp.c (resize_mini_window): Round height to a multiple of
frame's line height.  Fix bug in calculation of window start
position (Bug#16424).
Minor doc fix for Flymake.
* lisp/vc/log-edit.el: Fix highlighting of summary when it's the first line.
(log-edit--match-first-line): New function.
(log-edit-font-lock-keywords): Use it.
(log-edit-mode): Make jit-lock-defer-multiline work.