aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/NEWS10
-rw-r--r--lisp/subr.el3
2 files changed, 11 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 790cf47fbee..f9ede684085 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1459,8 +1459,14 @@ displayed with a "spinning bar".
1459** New variable `revert-buffer-in-progress-p' is true while a buffer is 1459** New variable `revert-buffer-in-progress-p' is true while a buffer is
1460being reverted, even if the buffer has a local `revert-buffer-function'. 1460being reverted, even if the buffer has a local `revert-buffer-function'.
1461 1461
1462** New variables `delayed-warnings-list' and `delayed-warnings-hook' allow 1462---
1463deferring warnings until the main command loop is executed. 1463** New variables `delayed-warnings-list' and `delayed-warnings-hook'.
1464If delayed-warnings-list is non-nil, the command loop calls
1465delayed-warnings-hook after post-command-hook. At present, this is
1466only used by Emacs on some platforms to display warnings during
1467startup, which might otherwise not be noticed. This uses the functions
1468display-delayed-warnings and collapse-delayed-warnings.
1469
1464 1470
1465+++ 1471+++
1466** `set-auto-mode' now respects mode: local variables at the end of files, 1472** `set-auto-mode' now respects mode: local variables at the end of files,
diff --git a/lisp/subr.el b/lisp/subr.el
index e735fd9577d..6c79b3f88e2 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1884,6 +1884,9 @@ Used from `delayed-warnings-hook' (which see)."
1884 (push warning collapsed))) 1884 (push warning collapsed)))
1885 (setq delayed-warnings-list (nreverse collapsed)))) 1885 (setq delayed-warnings-list (nreverse collapsed))))
1886 1886
1887;; At present this is only really useful for Emacs internals.
1888;; Document in the lispref if it becomes generally useful.
1889;; Ref http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00085.html
1887(defvar delayed-warnings-hook '(collapse-delayed-warnings 1890(defvar delayed-warnings-hook '(collapse-delayed-warnings
1888 display-delayed-warnings) 1891 display-delayed-warnings)
1889 "Normal hook run to process delayed warnings. 1892 "Normal hook run to process delayed warnings.