; Merge from origin/emacs-25
commit679341efebed30bfc939911e720e03204a1190b5
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 19 Mar 2017 19:34:05 +0000 (19 12:34 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 19 Mar 2017 19:34:05 +0000 (19 12:34 -0700)
tree28c6e45159f45912c6bd3d17de7bf71e85272bfe
parentda17b70a997d3b1c38d9f3d7d8ab6c7dab273765
parent129d30e980754547cf7264c93dabb883eaff7c63
; Merge from origin/emacs-25

The following commit was skipped:

129d30e Fix bug: Range-check integer ‘alpha’ frame parm value