diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-08 19:24:06 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-08 19:24:06 -0800 |
| commit | 00995c88dde4f8078a843b48faef16668a126d9c (patch) | |
| tree | eff0ed91f09522946ac7aaeae5ad1d2cfc93e7f7 /src/buffer.c | |
| parent | fae6cdc8ab0c9becd37afd9c31da56fecfad947b (diff) | |
| parent | 9e59de9449b53c3ecd85b624c11360ba9cafee75 (diff) | |
| download | emacs-00995c88dde4f8078a843b48faef16668a126d9c.tar.gz emacs-00995c88dde4f8078a843b48faef16668a126d9c.tar.bz2 emacs-00995c88dde4f8078a843b48faef16668a126d9c.zip | |
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
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/buffer.c b/src/buffer.c index 15735a298ad..edeed55e8be 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -61,7 +61,7 @@ struct buffer *all_buffers; Setting the default value also goes through the alist of buffers and stores into each buffer that does not say it has a local value. */ -struct buffer GCALIGNED buffer_defaults; +struct GCALIGNED buffer buffer_defaults; /* This structure marks which slots in a buffer have corresponding default values in buffer_defaults. @@ -84,7 +84,7 @@ struct buffer buffer_local_flags; /* This structure holds the names of symbols whose values may be buffer-local. It is indexed and accessed in the same way as the above. */ -struct buffer GCALIGNED buffer_local_symbols; +struct GCALIGNED buffer buffer_local_symbols; /* Return the symbol of the per-buffer variable at offset OFFSET in the buffer structure. */ |