Revert "[TODO] Remove noisy anti-noise feature"

This reverts commit c36b4eed2d76f0e804d27d35dd6281f858639f94.

diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index 6cd7022e12e8570fecc3adf4f575c3bc40f2df31..f525ea433addbb93b6f055d566be58e4c041451e 100644 (file)
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -292,6 +292,17 @@ entirely by setting `warning-suppress-types' or
              (insert (format (nth 1 level-info)
                              (format warning-type-format typename))
                      message)
+              ;; Don't output the buttons when doing batch compilation
+              ;; and similar.
+              (unless (or noninteractive (eq type 'bytecomp))
+                (insert " ")
+                (insert-button "Disable showing"
+                               'type 'warning-suppress-warning
+                               'warning-type type)
+                (insert " ")
+                (insert-button "Disable logging"
+                               'type 'warning-suppress-log-warning
+                               'warning-type type))
               (funcall newline)
              (when (and warning-fill-prefix (not (string-match "\n" message)))
                (let ((fill-prefix warning-fill-prefix)