aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2013-07-11 03:49:17 +0200
committerJuanma Barranquero2013-07-11 03:49:17 +0200
commitd77974bfcacb720419e6fcbe3d6f5c37c5a790d6 (patch)
tree98c2c42c55891cb7f014c6534f7cd848e8e3af8a
parent29abe551a0d9137718cd21732c9dc383d6493d71 (diff)
downloademacs-d77974bfcacb720419e6fcbe3d6f5c37c5a790d6.tar.gz
emacs-d77974bfcacb720419e6fcbe3d6f5c37c5a790d6.zip
lisp/subr.el (delay-warning): New function.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/subr.el7
2 files changed, 11 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce10b033652..37421981f7f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-07-11 Juanma Barranquero <lekktu@gmail.com>
2
3 * subr.el (delay-warning): New function.
4
12013-07-10 Eli Zaretskii <eliz@gnu.org> 52013-07-10 Eli Zaretskii <eliz@gnu.org>
2 6
3 * simple.el (default-line-height): New function. 7 * simple.el (default-line-height): New function.
diff --git a/lisp/subr.el b/lisp/subr.el
index a0ad7227462..b6ee96f879e 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3853,6 +3853,7 @@ FILE should be the name of a library, with no directory name."
3853 (declare (obsolete eval-after-load "23.2")) 3853 (declare (obsolete eval-after-load "23.2"))
3854 (eval-after-load file (read))) 3854 (eval-after-load file (read)))
3855 3855
3856
3856(defun display-delayed-warnings () 3857(defun display-delayed-warnings ()
3857 "Display delayed warnings from `delayed-warnings-list'. 3858 "Display delayed warnings from `delayed-warnings-list'.
3858Used from `delayed-warnings-hook' (which see)." 3859Used from `delayed-warnings-hook' (which see)."
@@ -3886,6 +3887,12 @@ By default, this hook contains functions to consolidate the
3886warnings listed in `delayed-warnings-list', display them, and set 3887warnings listed in `delayed-warnings-list', display them, and set
3887`delayed-warnings-list' back to nil.") 3888`delayed-warnings-list' back to nil.")
3888 3889
3890(defun delay-warning (type message &optional level buffer-name)
3891 "Display a delayed warning.
3892Aside from going through `delayed-warnings-list', this is equivalent
3893to `display-warning'."
3894 (push (list type message level buffer-name) delayed-warnings-list))
3895
3889 3896
3890;;;; invisibility specs 3897;;;; invisibility specs
3891 3898