diff options
| author | Paul Eggert | 2017-11-13 10:54:20 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-11-13 10:54:20 -0800 |
| commit | 99ceefa8ec4f9993663492cfcce6bb82a94569c1 (patch) | |
| tree | 507f76715b3086f34672b7c984dc09befaa57fc6 /admin | |
| parent | a7b7b85567f766ff510a5eaaaf32dbbbec15efd0 (diff) | |
| parent | 79108894dbcd642121466bb6af6c98c6a56e9233 (diff) | |
| download | emacs-99ceefa8ec4f9993663492cfcce6bb82a94569c1.tar.gz emacs-99ceefa8ec4f9993663492cfcce6bb82a94569c1.zip | |
Merge from origin/emacs-26
79108894db Port to IBM xlc 12.01
d14956099d Simplify by removing HAVE_STRUCT_ATTRIBUTE_ALIGNED
b1573a97e1 Use alignas to fix GCALIGN-related bugs
5d68dc9a2f Change vectorlike from struct to union
6aa0a26b46 Don't enable cursor-sensor-mode in mhtml-mode
2b8ef8dddf * lisp/files.el (abbreviate-file-name): Doc fix. (Bug#29267)
fe85ce1e16 Unbreak interactive run of a flymake test (bug#29267)
48ad00390d Fix Bug#29225
42daf83f08 CC Mode: Fix defun-open being recognized as brace-list-ope...
7775c47298 Merge from Gnulib
e470d16448 Pacify GCC when configured --with-x-toolkit=no
49450d0951 * lisp/find-dired.el (find-grep-dired): Doc fix. (Bug#29262)
e286b3381f Fix more flymake-diag-region eob corner cases and add test...
# Conflicts:
# src/lisp.h
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/CPP-DEFINES | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index eb3eadf2da8..04d1ff76f36 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES | |||
| @@ -102,7 +102,6 @@ HAVE_ALARM | |||
| 102 | HAVE_ALLOCA | 102 | HAVE_ALLOCA |
| 103 | HAVE_ALLOCA_H | 103 | HAVE_ALLOCA_H |
| 104 | HAVE_ALSA | 104 | HAVE_ALSA |
| 105 | HAVE_ATTRIBUTE_ALIGNED | ||
| 106 | HAVE_BDFFONT | 105 | HAVE_BDFFONT |
| 107 | HAVE_BOXES | 106 | HAVE_BOXES |
| 108 | HAVE_C99_STRTOLD | 107 | HAVE_C99_STRTOLD |