* net/shr.el (shr-fold-text): Don't bug out on zero-length text.
Correct same_at_end when restoring window points

* fileio.c (Finsert_file_contents): Compute same_at_end character
position using the old buffer size, not the new one, since
restore_window_points wants the old size.
Fixes: debbugs:19161
"Advice" is a mass noun.  Amend text accordingly.

functions.texi: (Advising Functions, Core Advising Primitives)
(Advising Named Functions, Advice combinators)
(Porting old advice): Replace, e.g., "an advice" with "advice".
"Advice" is a mass noun.  Amend text accordingly.

cl.texi (Obsolete Macros): Replace "an advice" with "advice".
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
* src/: Various fixes to use bool type and constants.

* src/dispnew.c (update_single_window): Remove arg `force_p' since it's
always true.
* src/xfaces.c (clear_face_cache): Use bool for the argument type.