aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert2016-12-07 12:39:07 -0800
committerPaul Eggert2016-12-07 12:39:07 -0800
commit3ace6b1e8511cf099a9297b066ea8f61ee12037e (patch)
treed01ad75b9a5793043c9c275173bc0de057903e02 /admin
parentfa8dbb61a003ece2cc08c83bda4f21f393340b2f (diff)
parent93c0f5126a50a0b1267ba74c444701af9ad46dc6 (diff)
downloademacs-3ace6b1e8511cf099a9297b066ea8f61ee12037e.tar.gz
emacs-3ace6b1e8511cf099a9297b066ea8f61ee12037e.zip
Merge from origin/emacs-25
93c0f51 Handle TeX comments when making new paragraph e0884f1 Restore keystroke echo in 'C-q' a6213ce Improve documentation of 'current-word' 0828126 Fix a typo in an Eshell defcustom 2e361c7 Minor copyedits of electric-pair-mode 7499ee8 ; Minor copyedit in the Emacs manual 45b652b Fix documentation of 'invocation-directory' 7f43d7c * admin/authors.el (authors-aliases): Add an entry. ba48880 ; Fix pl-refcard.tex
Diffstat (limited to 'admin')
-rw-r--r--admin/authors.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/admin/authors.el b/admin/authors.el
index fe1b26ffbe6..54c23207fee 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -50,6 +50,7 @@ files.")
50 ("Álvar Jesús Ibeas Martín" "Álvar Ibeas") 50 ("Álvar Jesús Ibeas Martín" "Álvar Ibeas")
51 ("Andrew Csillag" "Drew Csillag") 51 ("Andrew Csillag" "Drew Csillag")
52 ("Anna M. Bigatti" "Anna Bigatti") 52 ("Anna M. Bigatti" "Anna Bigatti")
53 ("Aurélien Aptel" "Aurelien Aptel")
53 ("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc." 54 ("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc."
54 "Barry A. Warsaw, ITB" "Barry Warsaw") 55 "Barry A. Warsaw, ITB" "Barry Warsaw")
55 ("Bill Carpenter" "WJ Carpenter") 56 ("Bill Carpenter" "WJ Carpenter")