Add 2011 to FSF/AIST copyright years.

[bpt/emacs.git] / lisp / emacs-lisp / warnings.el

diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index 99b0b3f..180296f 100644 (file)
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -1,16 +1,16 @@
 ;;; warnings.el --- log and display warnings
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -159,7 +157,7 @@ also call that function before the next warning.")
 ;;; safely, testing the existing value, before they call one of the
 ;;; warnings functions.
 ;;;###autoload
-(defvar warning-type-format " (%s)"
+(defvar warning-type-format (purecopy " (%s)")
   "Format for displaying the warning type in the warning message.
 The result of formatting the type this way gets included in the
 message under the control of the string in `warning-levels'.")
@@ -270,7 +268,7 @@ See also `warning-series', `warning-prefix-function' and
            (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
@@ -282,17 +280,28 @@ See also `warning-series', `warning-prefix-function' and
                (goto-char end)
                (if (bolp)
                    (forward-char -1))
-               (message "%s" (buffer-substring start (point)))))
-         ;; Interactively, decide whether the warning merits
-         ;; immediate display.
-         (or (< (warning-numeric-level level)
-                (warning-numeric-level warning-minimum-level))
-             (warning-suppress-p type warning-suppress-types)
-             (let ((window (display-buffer buffer)))
-               (when (and (markerp warning-series)
-                          (eq (marker-buffer warning-series) buffer))
-                 (set-window-start window warning-series))
-               (sit-for 0)))))))
+               (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)
+                  (warning-numeric-level warning-minimum-level))
+               (warning-suppress-p type warning-suppress-types)
+               (let ((window (display-buffer buffer)))
+                 (when (and (markerp warning-series)
+                            (eq (marker-buffer warning-series) buffer))
+                   (set-window-start window warning-series))
+                 (sit-for 0))))))))
 \f
 ;;;###autoload
 (defun lwarn (type level message &rest args)
@@ -325,5 +334,5 @@ this is equivalent to `display-warning', using
 
 (provide 'warnings)
 
-;;; arch-tag: faaad1c8-7b2a-4161-af38-5ab4afde0496
+;; arch-tag: faaad1c8-7b2a-4161-af38-5ab4afde0496
 ;;; warnings.el ends here