From: Glenn Morris <rgm@gnu.org>
Date: Sat, 26 Oct 2019 16:55:12 +0000 (-0700)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~880
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=045bcdb7c410d4ee7cda1766c76e8bf7df3bf82f;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

bd0f173 Fix trig simplification crash (bug#33052)
---

045bcdb7c410d4ee7cda1766c76e8bf7df3bf82f