summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-04-18 14:05:31 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-04-18 14:05:31 -0700
commit0808f2a1a331fbcb2e6ab57894502b0a34311869 (patch)
tree72386004f3d60a5fdbaf1176edeb38ba4083677e /admin
parent3aa73b04e81ebc396892b14e5e9fa78a13ff85d1 (diff)
parentac00a92e3df7111c0eb2c6456ae7df5850bfd8fa (diff)
Merge from origin/emacs-25
ac00a92 Make sh-electric-here-document-mode accessible in sh-mode-hoo... 3287f48 ; Add entry to MAINTAINERS b85981f * configure.ac (HAVE_MODULES): Exclude gnu-kfreebsd from prev... 0f33284 Make use of rectangle-preview custom variable. aa0d83a Make use of rectangle-preview face. 33bef6e Use 'grep-find-program' in check-declare.el a8560e5 Improve "C-h S" for cl-lib symbols 52e798b Fix minor issues with removing left or right fringes d6ffd64 Speed up redisplay in ansi-term mode 4ab671c Simplify 8-bit character handling by terminal for 'raw-text' f3653ec * configure.ac (HAVE_MODULES): Treat gnu like gnu-linux. (Bu... ab849b7 Fix w32 memory-management problem when extending buffer text
Diffstat (limited to 'admin')
-rw-r--r--admin/MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index 0fe30f01f6..f8baddd531 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -73,6 +73,7 @@ Michael Albinus
File Notifications
src/gfilenotify.c
+ src/kqueue.c
lisp/filenotify.el
test/lisp/filenotify-tests.el