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

[Richard M. Stallman]

Index: emacs/lisp/warnings.el
diff -c emacs/lisp/warnings.el:1.7 emacs/lisp/warnings.el:1.8
*** emacs/lisp/warnings.el:1.7  Wed Aug  7 10:26:28 2002
--- emacs/lisp/warnings.el      Thu Aug 29 12:46:11 2002
***************
*** 131,139 ****
  ;;;###autoload
  (defvar warning-series nil
    "Non-nil means treat multiple `display-warning' calls as a series.
! An integer is a position in the warnings buffer
! which is the start of the current series.
! t means the next warning begins a series (and stores an integer here).
  A symbol with a function definition is like t, except
  also call that function before the next warning.")
  (put 'warning-series 'risky-local-variable t)
--- 131,140 ----
  ;;;###autoload
  (defvar warning-series nil
    "Non-nil means treat multiple `display-warning' calls as a series.
! A marker indicates a position in the warnings buffer
! which is the start of the current series; it means that
! additional warnings in the same buffer should not move point.
! t means the next warning begins a series (and stores a marker here).
  A symbol with a function definition is like t, except
  also call that function before the next warning.")
  (put 'warning-series 'risky-local-variable t)
***************
*** 227,233 ****
          (goto-char (point-max))
          (when (and warning-series (symbolp warning-series))
            (setq warning-series
!                 (prog1 (point)
                    (unless (eq warning-series t)
                      (funcall warning-series)))))
          (unless (bolp)
--- 228,234 ----
          (goto-char (point-max))
          (when (and warning-series (symbolp warning-series))
            (setq warning-series
!                 (prog1 (point-marker)
                    (unless (eq warning-series t)
                      (funcall warning-series)))))
          (unless (bolp)
***************
*** 245,251 ****
                  (fill-column 78))
              (fill-region start (point))))
          (setq end (point))
!         (when warning-series
            (goto-char warning-series)))
        (if (nth 2 level-info)
            (funcall (nth 2 level-info)))
--- 246,253 ----
                  (fill-column 78))
              (fill-region start (point))))
          (setq end (point))
!         (when (and (markerp warning-series)
!                    (eq (marker-buffer warning-series) buffer))
            (goto-char warning-series)))
        (if (nth 2 level-info)
            (funcall (nth 2 level-info)))
***************
*** 262,268 ****
                 (warning-numeric-level warning-minimum-level))
              (warning-suppress-p group warning-suppress-types)
              (let ((window (display-buffer buffer)))
!               (when warning-series
                  (set-window-start window warning-series))
                (sit-for 0)))))))
  
--- 264,271 ----
                 (warning-numeric-level warning-minimum-level))
              (warning-suppress-p group 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)))))))