emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Richard M . Stallman
Subject: [Emacs-diffs] Changes to emacs/lisp/simple.el
Date: Sat, 29 Oct 2005 15:48:24 -0400

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.758 emacs/lisp/simple.el:1.759
*** emacs/lisp/simple.el:1.758  Mon Oct 24 16:56:53 2005
--- emacs/lisp/simple.el        Sat Oct 29 19:48:22 2005
***************
*** 1344,1350 ****
    ;; and will get another error.  To begin undoing the undos,
    ;; you must type some other command.
    (let ((modified (buffer-modified-p))
!       (recent-save (recent-auto-save-p)))
      ;; If we get an error in undo-start,
      ;; the next command should not be a "consecutive undo".
      ;; So set `this-command' to something other than `undo'.
--- 1344,1351 ----
    ;; and will get another error.  To begin undoing the undos,
    ;; you must type some other command.
    (let ((modified (buffer-modified-p))
!       (recent-save (recent-auto-save-p))
!       message)
      ;; If we get an error in undo-start,
      ;; the next command should not be a "consecutive undo".
      ;; So set `this-command' to something other than `undo'.
***************
*** 1373,1381 ****
      ;; so, ask the user whether she wants to skip the redo/undo pair.
      (let ((equiv (gethash pending-undo-list undo-equiv-table)))
        (or (eq (selected-window) (minibuffer-window))
!         (message (if undo-in-region
!                      (if equiv "Redo in region!" "Undo in region!")
!                    (if equiv "Redo!" "Undo!"))))
        (when (and (consp equiv) undo-no-redo)
        ;; The equiv entry might point to another redo record if we have done
        ;; undo-redo-undo-redo-... so skip to the very last equiv.
--- 1374,1382 ----
      ;; so, ask the user whether she wants to skip the redo/undo pair.
      (let ((equiv (gethash pending-undo-list undo-equiv-table)))
        (or (eq (selected-window) (minibuffer-window))
!         (setq message (if undo-in-region
!                           (if equiv "Redo in region!" "Undo in region!")
!                         (if equiv "Redo!" "Undo!"))))
        (when (and (consp equiv) undo-no-redo)
        ;; The equiv entry might point to another redo record if we have done
        ;; undo-redo-undo-redo-... so skip to the very last equiv.
***************
*** 1417,1423 ****
      ;; Record what the current undo list says,
      ;; so the next command can tell if the buffer was modified in between.
      (and modified (not (buffer-modified-p))
!        (delete-auto-save-file-if-necessary recent-save))))
  
  (defun buffer-disable-undo (&optional buffer)
    "Make BUFFER stop keeping undo information.
--- 1418,1427 ----
      ;; Record what the current undo list says,
      ;; so the next command can tell if the buffer was modified in between.
      (and modified (not (buffer-modified-p))
!        (delete-auto-save-file-if-necessary recent-save))
!     ;; Display a message announcing success.
!     (if message
!       (message message))))
  
  (defun buffer-disable-undo (&optional buffer)
    "Make BUFFER stop keeping undo information.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]