diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-12-07 12:39:08 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-12-07 12:39:08 -0800 |
| commit | fd6632b397316146397dd478a858f0b9a90efeed (patch) | |
| tree | b4cf7ad204c611d20db93f846a0b4aebadd06d31 /admin | |
| parent | 8209e0384441cafb67d779bbd17ea812269ca4cc (diff) | |
| parent | 9a857b922e03617c533b396705f8019871b33b54 (diff) | |
| download | emacs-fd6632b397316146397dd478a858f0b9a90efeed.tar.gz | |
Merge from origin/emacs-25
9a857b9 * admin/authors.el (authors-renamed-files-alist): Addition.
6d27423 Tweak refcard note about documentation location
e46a134 Improve treatment of Fortran's "class is"
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/authors.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/authors.el b/admin/authors.el index 54c23207fee..5a97c854a62 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -856,7 +856,7 @@ in the repository.") ("emacs-lisp/assoc.el" . "assoc.el") ("emacs-lisp/cust-print.el" . "cust-print.el") ("emacs-lisp/gulp.el" . "gulp.el") - ("lisp/abbrevlist.el" . "abbrevlist.el") + ("abbrevlist.el" . "abbrevlist.el") ("emulation/crisp.el" . "crisp.el") ("emulation/tpu-edt.el" . "tpu-edt.el") ("emulation/tpu-extras.el" . "tpu-extras.el") |