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

diff --cc admin/MAINTAINERS
index 0fe30f01f6a45368937beee3c459ad47bfa3d087,b15c57e7ee702c324056935114e1fd3b50cfd8f7..f8baddd53163f3f3b75466167fe647004d9f7c66
--- 1/admin/MAINTAINERS
--- 2/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

diff --cc configure.ac
Simple merge

diff --cc doc/lispref/windows.texi
Simple merge

diff --cc lisp/progmodes/sh-script.el
Simple merge

diff --cc lisp/term.el
Simple merge

diff --cc lisp/window.el
Simple merge