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

4 files changed, 21 insertions, 5 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
 
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 14e39bddd2e..bde8eb84a64 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -458,7 +458,11 @@ specifies in the mode line."
   :global t :group 'auto-revert :lighter global-auto-revert-mode-text
   (auto-revert-set-timer)
   (if global-auto-revert-mode
-      (auto-revert-buffers)
+      (progn
+        ;; We disable file notification because it could use too many
+        ;; ressources.  See <http://debbugs.gnu.org/22814>.
+        (setq auto-revert-use-notify nil)
+        (auto-revert-buffers))
     (dolist (buf (buffer-list))
       (with-current-buffer buf
 	(when auto-revert-use-notify
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index b176e64652e..664642554fa 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -266,9 +266,14 @@ Overrides local variable `indent-tabs-mode'."
     ;; WARNING[2]: test.vhd(85): Possible infinite loop
     ;; ** Warning: [4] ../src/emacsvsim.vhd(43): An abstract ...
     ;; ** Error: adder.vhd(190): Unknown identifier: ctl_numb
+    ;; ** Error: counter_rtl.vhd(18): Nonresolved signal 'hallo' has multiple sources.
+    ;;  Drivers:
+    ;;    counter_rtl.vhd(27):Conditional signal assignment line__27
+    ;;    counter_rtl.vhd(29):Conditional signal assignment line__29
     ("ModelSim" "vcom" "-93 -work \\1" "make" "-f \\1"
      nil "vlib \\1; vmap \\2 \\1" "./" "work/" "Makefile" "modelsim"
-     ("^\\(ERROR\\|WARNING\\|\\*\\* Error\\|\\*\\* Warning\\)[^:]*:\\( *\\[[0-9]+]\\)? \\([^ \t\n]+\\)(\\([0-9]+\\)):" 3 4 nil) ("" 0)
+     ("\\(ERROR:\\|WARNING\\[[0-9]+\\]:\\|\\*\\* Error:\\|\\*\\* Warning: \\[[0-9]+\\]\\| +\\) \\([^ ]+\\)(\\([0-9]+\\)):" 2 3 nil)
+     ("" 0)
      ("\\1/_primary.dat" "\\2/\\1.dat" "\\1/_primary.dat"
       "\\1/_primary.dat" "\\1/body.dat" downcase))
     ;; ProVHDL, Synopsys LEDA: provhdl -w work -f test.vhd