Merge from origin/emacs-25

5a44bfe Set auto-revert-use-notify to nil in global-auto-revert-mode.  (Bug#22814)
0d60bfc Fix ModelSim error parsing

2 files changed, 10 insertions, 3 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 8725049779d..172577601af 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1437,9 +1437,15 @@ make the new option `eshell-destroy-buffer-when-process-dies' non-nil.
 ** tar-mode: new `tar-new-entry' command, allowing for new members to
 be added to the archive.
 
+** Autorevert
+
+---
+*** Dired buffers are also auto-reverted via file notifications, if
+Emacs is compiled with file notification support.
+
 ---
-** Autorevert: dired buffers are also auto-reverted via file
-notifications, if Emacs is compiled with file notification support.
+*** `auto-revert-use-notify' is set to nil in `global-auto-revert-mode'.
+See <http://debbugs.gnu.org/22814>.
 
 ** File Notifications
 
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 0491935b10c..d5313677113 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -601,6 +601,7 @@ can cause this error.  Remove that file, execute 'ispell-kill-ispell'
 in Emacs, and then try spell-checking again.
 
 *** Emacs eats all file descriptors when using kqueue file notifications.
+See <http://debbugs.gnu.org/22814>.
 
 When you have a large number of buffers running auto-revert-mode, and
 Emacs is configured to use the kqueue file notification library, it
@@ -608,7 +609,7 @@ uses an own file descriptor for every watched file.  On systems with a
 small limit of file descriptors allowed per process, like OS X, you
 could run out of file descriptors.  You won't be able to open new files.
 
-Set auto-revert-use-notify to nil in order to avoid this problem.
+auto-revert-use-notify is set to nil in global-auto-revert-mode, therefore.
 
 * Runtime problems related to font handling