[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/warnings.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/10/11 22:06:52

Index: warnings.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/warnings.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- warnings.el 6 May 2008 03:21:21 -0000       1.16
+++ warnings.el 11 Oct 2008 22:06:52 -0000      1.17
@@ -268,7 +268,7 @@
            (goto-char warning-series)))
        (if (nth 2 level-info)
            (funcall (nth 2 level-info)))
-       (if noninteractive
+     (cond (noninteractive
            ;; Noninteractively, take the text we inserted
            ;; in the warnings buffer and print it.
            ;; Do this unconditionally, since there is no way
@@ -280,7 +280,18 @@
                (goto-char end)
                (if (bolp)
                    (forward-char -1))
-               (message "%s" (buffer-substring start (point)))))
+               (message "%s" (buffer-substring start (point))))))
+          ((and (daemonp) (null after-init-time))
+           ;; Warnings assigned during daemon initialization go into
+           ;; the messages buffer.
+           (message "%s"
+                    (with-current-buffer buffer
+                      (save-excursion
+                        (goto-char end)
+                        (if (bolp)
+                            (forward-char -1))
+                        (buffer-substring start (point))))))
+          (t
          ;; Interactively, decide whether the warning merits
          ;; immediate display.
          (or (< (warning-numeric-level level)
@@ -290,7 +301,7 @@
                (when (and (markerp warning-series)
                           (eq (marker-buffer warning-series) buffer))
                  (set-window-start window warning-series))
-               (sit-for 0)))))))
+                 (sit-for 0))))))))
 
 ;;;###autoload
 (defun lwarn (type level message &rest args)