; Merge from origin/emacs-26

The following commit was skipped:

940ae15 Fix overflow lockup with frames > 255 lines
This commit is contained in:
Glenn Morris 2018-10-09 13:12:56 -07:00
commit 8b3aacdf3a

Diff content is not available