Merge from origin/emacs-26
commit00995c88dde4f8078a843b48faef16668a126d9c
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Nov 2017 03:24:06 +0000 (8 19:24 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Nov 2017 03:24:06 +0000 (8 19:24 -0800)
treeeff0ed91f09522946ac7aaeae5ad1d2cfc93e7f7
parentfae6cdc8ab0c9becd37afd9c31da56fecfad947b
parent9e59de9449b53c3ecd85b624c11360ba9cafee75
Merge from origin/emacs-26

9e59de9449 Use GCALIGNED properly for GCC
b9d7c90260 In f90.el, set fill-paragraph-function to a useful value

# Conflicts:
# src/lisp.h
src/lisp.h