Merge from emacs-26

f0b8e64fb7 Avoid assertion violations in maybe_produce_line_number
7669bf7880 Avoid assertion violations in set_text_properties_1

diff --cc src/textprop.c
Simple merge

diff --cc src/xdisp.c
Simple merge