]> code.delx.au - gnu-emacs/commitdiff
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 7 Jun 2016 16:34:27 +0000 (09:34 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 7 Jun 2016 16:34:27 +0000 (09:34 -0700)
6e3adf8 Fix crash in syntax.c after GC
973ce5a Improve squiggly heredoc support in non-SMIE Ruby mode
9d5cceb Fix doc string quoting
0b33a23 Fix mouse dragging of vertical dividers with scroll bars on l...
a5d05f4 * etc/PROBLEMS: Mention the link-time problems on FreeBSD 11.

1  2 
etc/PROBLEMS
lisp/files.el
lisp/mouse.el
lisp/subr.el
src/syntax.c

diff --cc etc/PROBLEMS
Simple merge
diff --cc lisp/files.el
Simple merge
diff --cc lisp/mouse.el
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/syntax.c
Simple merge