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

[Richard M . Stallman]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.674 emacs/lisp/simple.el:1.675
*** emacs/lisp/simple.el:1.674  Mon Dec 27 16:34:43 2004
--- emacs/lisp/simple.el        Mon Dec 27 22:12:39 2004
***************
*** 1263,1269 ****
      (unless (and (eq last-command 'undo)
                 ;; If something (a timer or filter?) changed the buffer
                 ;; since the previous command, don't continue the undo seq.
!                (eq undo-list-saved buffer-undo-list))
        (setq undo-in-region
            (if transient-mark-mode mark-active (and arg (not (numberp arg)))))
        (if undo-in-region
--- 1263,1272 ----
      (unless (and (eq last-command 'undo)
                 ;; If something (a timer or filter?) changed the buffer
                 ;; since the previous command, don't continue the undo seq.
!                (let ((list buffer-undo-list))
!                  (while (eq (car list) nil)
!                    (setq list (cdr list)))
!                  (eq undo-list-saved list)))
        (setq undo-in-region
            (if transient-mark-mode mark-active (and arg (not (numberp arg)))))
        (if undo-in-region
***************
*** 1527,1534 ****
  ;; so it had better not do a lot of consing.
  (setq undo-outer-limit-function 'undo-outer-limit-truncate)
  (defun undo-outer-limit-truncate (size)
!   (if (yes-or-no-p (format "Buffer %s undo info is %d bytes long; discard it? 
"
!                          (buffer-name) size))
        (progn (setq buffer-undo-list nil) t)
      nil))
  
--- 1530,1538 ----
  ;; so it had better not do a lot of consing.
  (setq undo-outer-limit-function 'undo-outer-limit-truncate)
  (defun undo-outer-limit-truncate (size)
!   (if (let (use-dialog-box)
!       (yes-or-no-p (format "Buffer %s undo info is %d bytes long; discard it? 
"
!                            (buffer-name) size)))
        (progn (setq buffer-undo-list nil) t)
      nil))