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

[Juanma Barranquero]

Index: emacs/lisp/emacs-lisp/warnings.el
diff -c emacs/lisp/emacs-lisp/warnings.el:1.5 
emacs/lisp/emacs-lisp/warnings.el:1.6
*** emacs/lisp/emacs-lisp/warnings.el:1.5       Wed Feb  9 15:50:39 2005
--- emacs/lisp/emacs-lisp/warnings.el   Fri Jun 17 11:47:31 2005
***************
*** 76,91 ****
  the warning is logged in the warnings buffer, but the buffer
  is not immediately displayed.  See also `warning-minimum-log-level'."
    :group 'warnings
!   :type '(choice (const :emergency) (const :error) (const :warning))
    :version "22.1")
  (defvaralias 'display-warning-minimum-level 'warning-minimum-level)
  
  (defcustom warning-minimum-log-level :warning
    "Minimum severity level for logging a warning.
  If a warning severity level is lower than this,
! the warning is completely ignored."
    :group 'warnings
!   :type '(choice (const :emergency) (const :error) (const :warning))
    :version "22.1")
  (defvaralias 'log-warning-minimum-level 'warning-minimum-log-level)
  
--- 76,95 ----
  the warning is logged in the warnings buffer, but the buffer
  is not immediately displayed.  See also `warning-minimum-log-level'."
    :group 'warnings
!   :type '(choice (const :emergency) (const :error)
!                  (const :warning) (const :debug))
    :version "22.1")
  (defvaralias 'display-warning-minimum-level 'warning-minimum-level)
  
  (defcustom warning-minimum-log-level :warning
    "Minimum severity level for logging a warning.
  If a warning severity level is lower than this,
! the warning is completely ignored.
! Value must be lower or equal than `warning-minimum-level',
! because warnings not logged aren't displayed either."
    :group 'warnings
!   :type '(choice (const :emergency) (const :error)
!                  (const :warning) (const :debug))
    :version "22.1")
  (defvaralias 'log-warning-minimum-level 'warning-minimum-log-level)
  
***************
*** 203,209 ****
  \(The rest of the symbols represent subcategories, for warning purposes
  only, and you can use whatever symbols you like.)
  
! LEVEL should be either :warning, :error, or :emergency.
  :emergency -- a problem that will seriously impair Emacs operation soon
              if you do not attend to it promptly.
  :error     -- data or circumstances that are inherently wrong.
--- 207,215 ----
  \(The rest of the symbols represent subcategories, for warning purposes
  only, and you can use whatever symbols you like.)
  
! LEVEL should be either :debug, :warning, :error, or :emergency
! \(but see `warning-minimum-level' and `warning-minimum-log-level').
! 
  :emergency -- a problem that will seriously impair Emacs operation soon
              if you do not attend to it promptly.
  :error     -- data or circumstances that are inherently wrong.
***************
*** 223,229 ****
    (if (assq level warning-level-aliases)
        (setq level (cdr (assq level warning-level-aliases))))
    (or (< (warning-numeric-level level)
!        (warning-numeric-level warning-minimum-log-level))
        (warning-suppress-p type warning-suppress-log-types)
        (let* ((typename (if (consp type) (car type) type))
             (buffer (get-buffer-create (or buffer-name "*Warnings*")))
--- 229,235 ----
    (if (assq level warning-level-aliases)
        (setq level (cdr (assq level warning-level-aliases))))
    (or (< (warning-numeric-level level)
!          (warning-numeric-level warning-minimum-log-level))
        (warning-suppress-p type warning-suppress-log-types)
        (let* ((typename (if (consp type) (car type) type))
             (buffer (get-buffer-create (or buffer-name "*Warnings*")))
***************
*** 291,301 ****
  \(The rest of the symbols represent subcategories and
  can be whatever you like.)
  
! LEVEL should be either :warning, :error, or :emergency.
  :emergency -- a problem that will seriously impair Emacs operation soon
              if you do not attend to it promptly.
  :error     -- invalid data or circumstances.
! :warning   -- suspicious data or circumstances."
    (display-warning type (apply 'format message args) level))
  
  ;;;###autoload
--- 297,310 ----
  \(The rest of the symbols represent subcategories and
  can be whatever you like.)
  
! LEVEL should be either :debug, :warning, :error, or :emergency
! \(but see `warning-minimum-level' and `warning-minimum-log-level').
! 
  :emergency -- a problem that will seriously impair Emacs operation soon
              if you do not attend to it promptly.
  :error     -- invalid data or circumstances.
! :warning   -- suspicious data or circumstances.
! :debug     -- info for debugging only."
    (display-warning type (apply 'format message args) level))
  
  ;;;###autoload