From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 18 Apr 2016 21:05:31 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/0808f2a1a331fbcb2e6ab57894502b0a34311869

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
---

0808f2a1a331fbcb2e6ab57894502b0a34311869
diff --cc admin/MAINTAINERS
index 0fe30f01f6,b15c57e7ee..f8baddd531
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@@ -73,8 -73,9 +73,9 @@@ Michael Albinu
  
          File Notifications
  	    src/gfilenotify.c
+ 	    src/kqueue.c
  	    lisp/filenotify.el
 -	    test/automated/file-notify-tests.el
 +	    test/lisp/filenotify-tests.el
  
  Simen Heggestøyl
  	lisp/textmodes/css-mode.el