Add delayed warnings support.

* etc/NEWS: Document `delayed-warnings-list' and `delayed-warnings-hook'.

* lisp/subr.el (display-delayed-warnings): New function.
  (delayed-warnings-hook): New variable.

* src/keyboard.c (Qdelayed_warnings_hook): Define.
  (command_loop_1): Run `delayed-warnings-hook' if Vdelayed_warnings_list
  is non-nil.
  (syms_of_keyboard) <delayed-warnings-hook>: DEFSYM it.
  (syms_of_keyboard) <delayed-warnings-list>: DEFVAR_LISP it.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 48324a6be90f1ec51a36972c3e006a8092b3b15e..c75af6a0eb3e8fef43ed68638cb1372d46eb8134 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-28  Juanma Barranquero  <lekktu@gmail.com>
+
+       * NEWS: Document `delayed-warnings-list' and `delayed-warnings-hook'.
+
 2011-04-26  Daniel Colascione  <dan.colascione@gmail.com>
 
        * DEBUG: Document debug-on-event default behavior and utility for

diff --git a/etc/NEWS b/etc/NEWS
index 3ef56f34d508e0b3b56c515ce483c436a05381dc..32735aaa71943d1f87c48f04acd65aed005b40ee 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -909,6 +909,9 @@ displayed with a "spinning bar".
 ** New variable `revert-buffer-in-progress-p' is true while a buffer is
 being reverted, even if the buffer has a local `revert-buffer-function'.
 
+** New variables `delayed-warnings-list' and `delayed-warnings-hook' allow
+deferring warnings until the main command loop is executed.
+
 \f
 * Changes in Emacs 24.1 on non-free operating systems
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fee3f07ccca3c4006de7c61c0aae13016174d9d6..1444a9ebe5f1928ddece8a838d45f3e990da715f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-28  Juanma Barranquero  <lekktu@gmail.com>
+
+       * subr.el (display-delayed-warnings): New function.
+       (delayed-warnings-hook): New variable.
+
 2011-04-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * pcomplete.el (pcomplete-completions-at-point):

diff --git a/lisp/subr.el b/lisp/subr.el
index e374b56d2a8bc144f32fe3cf735988d395db908a..7f0066548a4ca12cb6691a05478ab1cbdb59917a 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1772,6 +1772,19 @@ This makes or adds to an entry on `after-load-alist'.
 FILE should be the name of a library, with no directory name."
   (eval-after-load file (read)))
 (make-obsolete 'eval-next-after-load `eval-after-load "23.2")
+
+(defun display-delayed-warnings ()
+  "Display delayed warnings from `delayed-warnings-list'.
+This is the default value of `delayed-warnings-hook'."
+  (dolist (warning (nreverse delayed-warnings-list))
+    (apply 'display-warning warning))
+  (setq delayed-warnings-list nil))
+
+(defvar delayed-warnings-hook '(display-delayed-warnings)
+  "Normal hook run to process delayed warnings.
+Functions in this hook should access the `delayed-warnings-list'
+variable (which see) and remove from it the warnings they process.")
+
 \f
 ;;;; Process stuff.
 
@@ -2522,7 +2535,7 @@ Note: :data and :device are currently not supported on Windows."
       (concat "\"" result (substring argument start) "\"")))
 
    ((and (eq system-type 'windows-nt) (w32-shell-dos-semantics))
-    
+
     ;; First, quote argument so that CommandLineToArgvW will
     ;; understand it.  See
     ;; http://msdn.microsoft.com/en-us/library/17w5ykft%28v=vs.85%29.aspx

diff --git a/src/ChangeLog b/src/ChangeLog
index 107d6f0073afe30486c925abeea24e2f4a5b19cf..e20feb0f6f7a6808d6651362eb4f9790d8079f9f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2011-04-28  Juanma Barranquero  <lekktu@gmail.com>
+
+       * keyboard.c (Qdelayed_warnings_hook): Define.
+       (command_loop_1): Run `delayed-warnings-hook'
+       if Vdelayed_warnings_list is non-nil.
+       (syms_of_keyboard) <delayed-warnings-hook>: DEFSYM it.
+       (syms_of_keyboard) <delayed-warnings-list>: DEFVAR_LISP it.
+
 2011-04-28  Eli Zaretskii  <eliz@gnu.org>
 
        * doprnt.c (doprnt): Don't return value smaller than the buffer

diff --git a/src/keyboard.c b/src/keyboard.c
index fac098ddffda9e9e45e85cc667b234e7c5b04cbc..a94456fce2eedd50d6528519196d4cdc7ce87618 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -267,6 +267,8 @@ static Lisp_Object Qpost_command_hook;
 
 static Lisp_Object Qdeferred_action_function;
 
+static Lisp_Object Qdelayed_warnings_hook;
+
 static Lisp_Object Qinput_method_exit_on_first_char;
 static Lisp_Object Qinput_method_use_echo_area;
 
@@ -1356,6 +1358,10 @@ command_loop_1 (void)
       if (!NILP (echo_area_buffer[0]))
        resize_echo_area_exactly ();
 
+      /* If there are warnings waiting, process them.  */
+      if (!NILP (Vdelayed_warnings_list))
+        safe_run_hooks (Qdelayed_warnings_hook);
+
       if (!NILP (Vdeferred_action_list))
        safe_run_hooks (Qdeferred_action_function);
     }
@@ -1573,6 +1579,10 @@ command_loop_1 (void)
       if (!NILP (echo_area_buffer[0]))
        resize_echo_area_exactly ();
 
+      /* If there are warnings waiting, process them.  */
+      if (!NILP (Vdelayed_warnings_list))
+        safe_run_hooks (Qdelayed_warnings_hook);
+
       safe_run_hooks (Qdeferred_action_function);
 
       /* If there is a prefix argument,
@@ -11498,6 +11508,7 @@ syms_of_keyboard (void)
   DEFSYM (Qpre_command_hook, "pre-command-hook");
   DEFSYM (Qpost_command_hook, "post-command-hook");
   DEFSYM (Qdeferred_action_function, "deferred-action-function");
+  DEFSYM (Qdelayed_warnings_hook, "delayed-warnings-hook");
   DEFSYM (Qfunction_key, "function-key");
   DEFSYM (Qmouse_click, "mouse-click");
   DEFSYM (Qdrag_n_drop, "drag-n-drop");
@@ -12069,6 +12080,14 @@ This function is called with no arguments after each command
 whenever `deferred-action-list' is non-nil.  */);
   Vdeferred_action_function = Qnil;
 
+  DEFVAR_LISP ("delayed-warnings-list", Vdelayed_warnings_list,
+               doc: /* List of warnings to be displayed as soon as possible.
+Each element must be a list (TYPE MESSAGE [LEVEL [BUFFER-NAME]]),
+as per the args of `display-warning' (which see).
+If this variable is non-nil, `delayed-warnings-hook' will be run
+immediately after running `post-command-hook'.  */);
+  Vdelayed_warnings_list = Qnil;
+
   DEFVAR_LISP ("suggest-key-bindings", Vsuggest_key_bindings,
               doc: /* *Non-nil means show the equivalent key-binding when M-x command has one.
 The value can be a length of time to show the message for.