aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert2016-06-19 00:47:00 +0200
committerPaul Eggert2016-06-19 00:47:00 +0200
commit68cb71c0928eb8b10487a125192f43923e8bfe7f (patch)
tree053133358af1bd991d60ed6c29590ad84b29fed0 /admin
parent87c9d8fcec183c8f4933e218c1895b6a0722b1e1 (diff)
parent9ae514a9b7ed368ea97ddefa806079b6423833cb (diff)
downloademacs-68cb71c0928eb8b10487a125192f43923e8bfe7f.tar.gz
emacs-68cb71c0928eb8b10487a125192f43923e8bfe7f.zip
Merge from origin/emacs-25
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.
Diffstat (limited to 'admin')
-rw-r--r--admin/authors.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/admin/authors.el b/admin/authors.el
index b93c9b251ca..1447bd4f49a 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -886,6 +886,8 @@ in the repository.")
886 ("ED.WORSHIP" . "JOKES") 886 ("ED.WORSHIP" . "JOKES")
887 ("GNU.JOKES" . "JOKES") 887 ("GNU.JOKES" . "JOKES")
888 ("CHARACTERS" . "TODO") 888 ("CHARACTERS" . "TODO")
889 ("lisp/character-fold.el" . "lisp/char-fold.el")
890 ("test/automated/character-fold-tests.el" . "test/automated/char-fold-tests.el")
889 ("images/gnus/mail_send.xpm" . "mail-send.xpm") ; still in images/gnus 891 ("images/gnus/mail_send.xpm" . "mail-send.xpm") ; still in images/gnus
890 ;; Renamed within same directory. 892 ;; Renamed within same directory.
891 ("schema/xhtml-basic-form.rnc" . "xhtml-bform.rnc" ) 893 ("schema/xhtml-basic-form.rnc" . "xhtml-bform.rnc" )