From: Noam Postavsky <npostavs@gmail.com>
Date: Sat, 4 Aug 2018 15:55:04 +0000 (-0400)
Subject: Merge from emacs-26
X-Git-Tag: emacs-27.0.90~4649
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=529ec8df9355116b165b4ec588693934137c88ca;p=emacs.git

Merge from emacs-26

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

529ec8df9355116b165b4ec588693934137c88ca