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

[Richard M . Stallman]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.677 emacs/lisp/simple.el:1.678
*** emacs/lisp/simple.el:1.677  Wed Dec 29 01:33:04 2004
--- emacs/lisp/simple.el        Fri Dec 31 15:13:00 2004
***************
*** 1234,1243 ****
  (defvar undo-no-redo nil
    "If t, `undo' doesn't go through redo entries.")
  
- (defvar undo-list-saved nil
-   "The value of `buffer-undo-list' saved by the last undo command.")
- (make-variable-buffer-local 'undo-list-saved)
- 
  (defun undo (&optional arg)
    "Undo some previous changes.
  Repeat this command to undo more changes.
--- 1234,1239 ----
***************
*** 1266,1272 ****
                 (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
--- 1262,1270 ----
                 (let ((list buffer-undo-list))
                   (while (eq (car list) nil)
                     (setq list (cdr list)))
!                  ;; If the last undo record made was made by undo
!                  ;; it shows nothing else happened in between.
!                  (gethash list undo-equiv-table)))
        (setq undo-in-region
            (if transient-mark-mode mark-active (and arg (not (numberp arg)))))
        (if undo-in-region
***************
*** 1320,1326 ****
        (setq prev tail tail (cdr tail))))
      ;; Record what the current undo list says,
      ;; so the next command can tell if the buffer was modified in between.
-     (setq undo-list-saved buffer-undo-list)
      (and modified (not (buffer-modified-p))
         (delete-auto-save-file-if-necessary recent-save))))
  
--- 1318,1323 ----
***************
*** 1329,1336 ****
  No argument or nil as argument means do this for the current buffer."
    (interactive)
    (with-current-buffer (if buffer (get-buffer buffer) (current-buffer))
!     (setq buffer-undo-list t
!         undo-list-saved nil)))
  
  (defun undo-only (&optional arg)
    "Undo some previous changes.
--- 1326,1332 ----
  No argument or nil as argument means do this for the current buffer."
    (interactive)
    (with-current-buffer (if buffer (get-buffer buffer) (current-buffer))
!     (setq buffer-undo-list t)))
  
  (defun undo-only (&optional arg)
    "Undo some previous changes.