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

[Juanma Barranquero]

Index: emacs/lisp/warnings.el
diff -c emacs/lisp/warnings.el:1.5 emacs/lisp/warnings.el:1.6
*** emacs/lisp/warnings.el:1.5  Fri Jul 26 03:08:58 2002
--- emacs/lisp/warnings.el      Fri Jul 26 03:57:24 2002
***************
*** 34,40 ****
      (:error "Error%s: ")
      (:warning "Warning%s: ")
      (:debug "Debug%s: "))
!   "List of severity level definitions for `define-warnings'.
  Each element looks like (LEVEL STRING FUNCTION) and
  defines LEVEL as a severity level.  STRING is the description
  to use in the buffer, and FUNCTION (which may be omitted)
--- 34,40 ----
      (:error "Error%s: ")
      (:warning "Warning%s: ")
      (:debug "Debug%s: "))
!   "List of severity level definitions for `display-warning'.
  Each element looks like (LEVEL STRING FUNCTION) and
  defines LEVEL as a severity level.  STRING is the description
  to use in the buffer, and FUNCTION (which may be omitted)
***************
*** 86,92 ****
  The element must match the first elements of GROUP.
  Thus, (foo bar) as an element matches (foo bar)
  or (foo bar ANYTHING...) as GROUP.
! If GROUP is a symbol FOO, that is equivalent to the list (FOO)
  so only the element (FOO) will match it."
    :group 'warnings
    :type '(repeat (repeat symbol))
--- 86,92 ----
  The element must match the first elements of GROUP.
  Thus, (foo bar) as an element matches (foo bar)
  or (foo bar ANYTHING...) as GROUP.
! If GROUP is a symbol FOO, that is equivalent to the list (FOO),
  so only the element (FOO) will match it."
    :group 'warnings
    :type '(repeat (repeat symbol))
***************
*** 121,127 ****
    (let* ((elt (assq level warning-levels))
         (link (memq elt warning-levels)))
      (length link)))
!   
  (defvar warning-series nil
    "Non-nil means treat multiple `display-warning' calls as a series.
  An integer is a position in the warnings buffer
--- 121,127 ----
    (let* ((elt (assq level warning-levels))
         (link (memq elt warning-levels)))
      (length link)))
! 
  (defvar warning-series nil
    "Non-nil means treat multiple `display-warning' calls as a series.
  An integer is a position in the warnings buffer
***************
*** 171,177 ****
  ;;;###autoload
  (defun display-warning (group message &optional level buffer-name)
    "Display a warning message, MESSAGE.
! GROUP should be a custom group name (a symbol).
  or else a list of symbols whose first element is a custom group name.
  \(The rest of the symbols represent subcategories, for warning purposes
  only, and you can use whatever symbols you like.)
--- 171,177 ----
  ;;;###autoload
  (defun display-warning (group message &optional level buffer-name)
    "Display a warning message, MESSAGE.
! GROUP should be a custom group name (a symbol),
  or else a list of symbols whose first element is a custom group name.
  \(The rest of the symbols represent subcategories, for warning purposes
  only, and you can use whatever symbols you like.)
***************
*** 215,222 ****
          (if warning-prefix-function
              (setq level-info (funcall warning-prefix-function
                                        level level-info)))
!         (setq group-string (format warning-group-format groupname))
!         (insert (format (nth 1 level-info) group-string)
                  message)
          (newline)
          (when (and warning-fill-prefix (not (string-match "\n" message)))
--- 215,222 ----
          (if warning-prefix-function
              (setq level-info (funcall warning-prefix-function
                                        level level-info)))
!         (insert (format (nth 1 level-info)
!                           (format warning-group-format groupname))
                  message)
          (newline)
          (when (and warning-fill-prefix (not (string-match "\n" message)))
***************
*** 238,244 ****
          ;; Interactively, decide whether the warning merits
          ;; immediate display.
          (or (< (warning-numeric-level level)
!                (warning-numeric-level warning-minimum-level)) 
              (warning-suppress-p group warning-suppress-types)
              (let ((window (display-buffer buffer)))
                (when warning-series
--- 238,244 ----
          ;; Interactively, decide whether the warning merits
          ;; immediate display.
          (or (< (warning-numeric-level level)
!                (warning-numeric-level warning-minimum-level))
              (warning-suppress-p group warning-suppress-types)
              (let ((window (display-buffer buffer)))
                (when warning-series