]> code.delx.au - gnu-emacs/commitdiff
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 18 Jun 2016 22:47:00 +0000 (00:47 +0200)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 18 Jun 2016 22:47:00 +0000 (00:47 +0200)
9ae514a * etc/AUTHORS: Update the AUTHORS file
3ca428e add entries to authors.el
66d556b Fix eldoc-related freezes in python mode
d59bcbc Handle mouse leaving initial window in `mouse-set-region' (Bu...
27fe1e4 org.el: Fix bindings of < and > for calendar scrolling
a813487 Fix undo boundary in recursive edit (Bug#23632)
1f85b7c Doc fixes re alist-get.  (Bug#23548)
ba3f206 * lisp/progmodes/python.el (inferior-python-mode): Avoid tabs...
56fa055 * src/syntax.c (syms_of_syntax) <comment-end-can-be-escaped>:...
4c1370a * lisp/help-fns.el (describe-function-1): Fix handling of fil...
a3f7ae8 * lisp/emacs-lisp/cl-macs.el (cl-loop): Doc fix re "by".
601b9b2 * doc/misc/cl.texi (Mapping over Sequences): Fix cl-notevery.

1  2 
etc/NEWS
lisp/emacs-lisp/cl-macs.el
lisp/help-fns.el
lisp/mouse.el
lisp/org/org.el
lisp/progmodes/python.el
lisp/simple.el
lisp/subr.el
src/keyboard.c
src/syntax.c
test/lisp/simple-tests.el

diff --cc etc/NEWS
Simple merge
Simple merge
Simple merge
diff --cc lisp/mouse.el
Simple merge
diff --cc lisp/org/org.el
Simple merge
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/syntax.c
Simple merge
Simple merge