]> git.eshelyaron.com Git - emacs.git/commit
Merge from emacs-26
authorNoam Postavsky <npostavs@gmail.com>
Sat, 4 Aug 2018 15:55:04 +0000 (11:55 -0400)
committerNoam Postavsky <npostavs@gmail.com>
Sat, 4 Aug 2018 15:55:04 +0000 (11:55 -0400)
commit529ec8df9355116b165b4ec588693934137c88ca
tree4caa7ea850b97c53ce0e8837bb570d8bf02f5bbe
parentb6dd0374452177b2040044bce48d830692bf48f2
parentf0b8e64fb7720a9376bde80cc59fe37b0df83b9d
Merge from emacs-26

f0b8e64fb7 Avoid assertion violations in maybe_produce_line_number
7669bf7880 Avoid assertion violations in set_text_properties_1
src/textprop.c
src/xdisp.c