Changelog: note mouse-sel workaround
composite.c (composition_update_it): Fix indexing of LGSTRING_CHAR (Bug#15984).
Conflicts:
	src/ChangeLog
* lisp/net/shr.el (shr-render-region): Autoload.

Conflicts:
	lisp/ChangeLog
* lisp/indent.el (indent-according-to-mode): Flush to column 0 in text-mode
after an empty line.

Conflicts:
	lisp/ChangeLog
* 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.

Conflicts:
	src/ChangeLog
Update Emacs Lisp Reference and Emacs Manual