From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 9 Nov 2017 03:24:06 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~6170
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=00995c88dde4f8078a843b48faef16668a126d9c;p=emacs.git

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
---

00995c88dde4f8078a843b48faef16668a126d9c
diff --cc src/lisp.h
index 1ce32f33420,015346858b5..e3262ad40f3
--- a/src/lisp.h
+++ b/src/lisp.h
@@@ -2940,8 -2945,18 +2944,8 @@@ CHECK_NUMBER_CDR (Lisp_Object x
  
  /* This version of DEFUN declares a function prototype with the right
     arguments, so we can catch errors with maxargs at compile-time.  */
 -#ifdef _MSC_VER
 -#define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc)	\
 -   Lisp_Object fnname DEFUN_ARGS_ ## maxargs ;				\
 -   static struct GCALIGNED Lisp_Subr sname =				\
 -   { { (PVEC_SUBR << PSEUDOVECTOR_AREA_BITS)				\
 -       | (sizeof (struct Lisp_Subr) / sizeof (EMACS_INT)) },		\
 -      { (Lisp_Object (__cdecl *)(void))fnname },                        \
 -       minargs, maxargs, lname, intspec, 0};				\
 -   Lisp_Object fnname
 -#else  /* not _MSC_VER */
  #define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc)	\
-    static struct Lisp_Subr GCALIGNED sname =				\
+    static struct GCALIGNED Lisp_Subr sname =				\
       { { PVEC_SUBR << PSEUDOVECTOR_AREA_BITS },				\
         { .a ## maxargs = fnname },					\
         minargs, maxargs, lname, intspec, 0};				\