diff options
| author | Ted Zlatanov <tzz@lifelogs.com> | 2014-12-12 19:15:10 -0500 |
|---|---|---|
| committer | Ted Zlatanov <tzz@lifelogs.com> | 2014-12-12 19:23:19 -0500 |
| commit | 28e0d0c95d8e17e18e94744e99ccd68c8c911703 (patch) | |
| tree | a45021bd7042b2008cf6084bd4019777b7575492 /admin/MAINTAINERS | |
| parent | b81a1837916a7f3f7abd953338302fa237a532f2 (diff) | |
| download | emacs-28e0d0c95d8e17e18e94744e99ccd68c8c911703.tar.gz | |
Merge from origin/emacs-24
bd6c441 * simple.el (password-word-equivalents): Add "passcode", used for numeric secrets like PINs or RSA tokens.
16d4c1c A better fix for bug#19346
82ec808 * .gitignore: Add !lib/std*.in.h, so as to not ignore the .in.h files.
3cf7629 Git ignore lib/std*.h
301a401 Always define `gnutls-available-p' even if GnuTLS is not available.
d76b9b2 Don't break example string between 2 lines (bug#19257)
75b4857 Port commit-msg to mawk
9ac0332 Improve commit-msg messages and autosquash
0c2f254 Support overflow-newline-into-fringe together with word-wrap (bug#19300)
935ee05 * net/tramp-sh.el (tramp-get-remote-path): Use a login shell in order to determine `tramp-own-remote-path'.
c2db939 python.el: Support interpreter paths with spaces
d83f329 ChangeLog fix
0f9fbb9 Port commit-message checking to FreeBSD 9.
3db1ada admin/MAINTAINERS: Update my interests and responsibilities.
6382f24 * .gitignore: Ignore autosave files.
Conflicts:
ChangeLog
lisp/progmodes/python.el
src/gnutls.c
Diffstat (limited to 'admin/MAINTAINERS')
| -rw-r--r-- | admin/MAINTAINERS | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 9a46b64c3e8..57f199b27c2 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -31,6 +31,7 @@ Eli Zaretskii src/msdos.[ch] src/dosfns.[ch] src/w16select.c + src/unexcoff.c lisp/term/internal.el lisp/term/pc-win.el lisp/dos-fns.el @@ -80,14 +81,18 @@ Bastien Guerry Eli Zaretskii doc/* lispref/* - info/dir src/xfaces.c src/xdisp.c src/term.c src/dispnew.c + src/dispextern.h src/frame.c src/dired.c + src/unexw32.c + src/w32*.[ch] + src/window.c + nt/* lisp/arc-mode.el lisp/menu-bar.el @@ -97,6 +102,8 @@ Eli Zaretskii lisp/startup.el lisp/w32*.el + admin/unidata/* + Stefan Monnier src/intervals.c src/keyboard.c @@ -181,24 +188,10 @@ src/tparam.c src/undo.c src/unexaix.c src/unexalpha.c -src/unexcoff.c src/unexelf.c src/unexhp9k800.c -src/unexw32.c src/vm-limit.c -src/w32.c -src/w32console.c -src/w32fns.c -src/w32heap.c -src/w32inevt.c -src/w32menu.c -src/w32proc.c -src/w32reg.c -src/w32select.c -src/w32term.c -src/w32xfns.c src/widget.c -src/window.c src/xfns.c src/xmenu.c src/xrdb.c |