diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:10:30 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:10:30 -0700 |
| commit | 0274862f395807d05585eb6325c5285f1bf775d8 (patch) | |
| tree | da85c643cf8040db118538bf7705d2a461ec055a /admin | |
| parent | f902a6b89e6970eabaaf3c2c1452bf2104e2004b (diff) | |
| parent | d08afa1d0339425f03a48e533166a7cadfa66139 (diff) | |
Merge from origin/emacs-25
d08afa1 * etc/AUTHORS: Update the AUTHORS file
2668500 ;; * ChangeLog.2: ChangeLog update.
7acfaea ; ChangeLog fixes
97d28b4 * admin/authors.el (authors-valid-file-names): Addition.
9ab52f6 * admin/authors.el: Additions.
0e646c7 Warn about Cairo-related problems
bc4c07f Don't let completion break `declare' handling
66f95e0 Adjust match data before calling after-change-funs
52cf0d5 Do not show string-rectangle preview if minibuffer is empty
6a3d031 * etc/PROBLEMS: Add entry about selection problems under Plas...
# Conflicts:
# ChangeLog.2
# src/lisp.h
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/authors.el | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/admin/authors.el b/admin/authors.el index 0738e2a8dd..3e9e005e22 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -652,6 +652,7 @@ Changes to files in this list are not listed.") "ebuild.bat" "install.bat" "fast-install.bat" "debug.bat.in" "emacs.bat.in" "addsection.c" "inc/sys/dir.h" "inc/gettext.h" + "time.h" ".gdbinit-union" "alloca.s" "make-delta" @@ -750,11 +751,20 @@ Changes to files in this list are not listed.") "getopt_.h" "getopt_int.h" "gettext.h" "leditcfns.c" "loadst.c" "make-path.c" "qsort.c" "sorted-doc.c" "tcp.c" "timer.c" "wakeup.c" "yow.c" "grep-changelog" "grep-changelog.1" + ;; semantic files now removed from the repository + "semantic/bovine/c-by.el" "semantic/bovine/make-by.el" + "semantic/bovine/scm-by.el" "semantic/wisent/javat-wy.el" + "semantic/wisent/js-wy.el" "semantic/wisent/python-wy.el" + "srecode/srt-wy.el" ;; etc/ "emacsclient.c" "etags.c" "hexl.c" "make-docfile.c" "movemail.c" "test-distrib.c" "testfile" "tpu-edt.doc" ; see below - "lisp/obsolete/vc-mcvs.el" + "obsolete/vc-mcvs.el" + "nnwarchive.el" + "nnultimate.el" + "nnslashdot.el" + "webmail.el" ) "File names which are valid, but no longer exist (or cannot be found) in the repository.") @@ -892,6 +902,14 @@ in the repository.") ("major.texi" . "modes.texi") ("msdog-xtra.texi" . "msdos-xtra.texi") ("msdog.texi" . "msdos.texi") + ;; Moved from lisp/gnus/ to lisp/calendar/ + ("time-date.el" . "calendar/time-date.el") + ;; Moved from lisp/gnus/ to lisp/mail/ + ("binhex.el" . "mail/binhex.el") + ("uudecode.el" . "mail/uudecode.el") + ;; Moved from lisp/gnus/ to lisp/net/ + ("imap.el" . "net/imap.el") + ("rfc2104.el" . "net/rfc2104.el") ;; And from emacs/ to misc/ and back again. ("ns-emacs.texi" . "macos.texi") ("overrides.texi" . "gnus-overrides.texi") @@ -909,7 +927,6 @@ in the repository.") ("lisp/character-fold.el" . "lisp/char-fold.el") ("test/automated/character-fold-tests.el" . "test/automated/char-fold-tests.el") ("images/gnus/mail_send.xpm" . "mail-send.xpm") ; still in images/gnus - ;; Renamed within same directory. ("schema/xhtml-basic-form.rnc" . "xhtml-bform.rnc" ) ("schema/xhtml-basic-table.rnc" . "xhtml-btable.rnc") ("schema/xhtml-list.rnc" . "xhtml-lst.rnc") |