]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-26
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 13 Nov 2017 18:54:20 +0000 (10:54 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 13 Nov 2017 18:54:20 +0000 (10:54 -0800)
commit99ceefa8ec4f9993663492cfcce6bb82a94569c1
tree507f76715b3086f34672b7c984dc09befaa57fc6
parenta7b7b85567f766ff510a5eaaaf32dbbbec15efd0
parent79108894dbcd642121466bb6af6c98c6a56e9233
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
14 files changed:
admin/CPP-DEFINES
configure.ac
lib/gnulib.mk.in
lisp/files.el
lisp/progmodes/flymake.el
m4/gnulib-comp.m4
src/alloc.c
src/cmds.c
src/data.c
src/eval.c
src/fileio.c
src/keyboard.c
src/lisp.h
src/lread.c