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

[Juanma Barranquero]

Index: emacs/lisp/winner.el
diff -c emacs/lisp/winner.el:1.23 emacs/lisp/winner.el:1.24
*** emacs/lisp/winner.el:1.23   Mon Nov 11 10:04:23 2002
--- emacs/lisp/winner.el        Tue Feb  4 07:15:32 2003
***************
*** 128,138 ****
                  while (= a b)
                  finally return (< a b)))))
  
! (defun winner-win-data () 
    ;; Essential properties of the windows in the selected frame.
    (loop for win in (winner-sorted-window-list)
          collect (cons (winner-edges win) (window-buffer win))))
!         
  ;; This variable is updated with the current window configuration
  ;; every time it changes.
  (defvar winner-currents nil)
--- 128,138 ----
                  while (= a b)
                  finally return (< a b)))))
  
! (defun winner-win-data ()
    ;; Essential properties of the windows in the selected frame.
    (loop for win in (winner-sorted-window-list)
          collect (cons (winner-edges win) (window-buffer win))))
! 
  ;; This variable is updated with the current window configuration
  ;; every time it changes.
  (defvar winner-currents nil)
***************
*** 262,268 ****
       ((window-live-p chosen) (select-window chosen))
       ((window-minibuffer-p (selected-window))
        (other-window 1)))
!     (when (/= minisize (window-height miniwin)) 
        (letf (((selected-window) miniwin) )
          (setf (window-height) minisize)))))
  
--- 262,268 ----
       ((window-live-p chosen) (select-window chosen))
       ((window-minibuffer-p (selected-window))
        (other-window 1)))
!     (when (/= minisize (window-height miniwin))
        (letf (((selected-window) miniwin) )
          (setf (window-height) minisize)))))
  
***************
*** 279,285 ****
    (letf (((current-buffer)))
      (loop with alist
          for win in (winner-window-list)
!         for entry = 
            (or (assq (window-buffer win) alist)
                (car (push (list (set-buffer (window-buffer win))
                                 (cons (mark t) (winner-active-region)))
--- 279,285 ----
    (letf (((current-buffer)))
      (loop with alist
          for win in (winner-window-list)
!         for entry =
            (or (assq (window-buffer win) alist)
                (car (push (list (set-buffer (window-buffer win))
                                 (cons (mark t) (winner-active-region)))
***************
*** 335,341 ****
  
        ;; Restore marks
        (letf (((current-buffer)))
!       (loop for buf in buffers 
              for entry = (cadr (assq buf winner-point-alist))
              do (progn (set-buffer buf)
                        (set-mark (car entry))
--- 335,341 ----
  
        ;; Restore marks
        (letf (((current-buffer)))
!       (loop for buf in buffers
              for entry = (cadr (assq buf winner-point-alist))
              do (progn (set-buffer buf)
                        (set-mark (car entry))
***************
*** 384,390 ****
                (not winner-mode))))
      (cond
       ;; Turn mode on
!      (on-p 
        (setq winner-mode t)
        (cond
         ((winner-hook-installed-p)
--- 384,390 ----
                (not winner-mode))))
      (cond
       ;; Turn mode on
!      (on-p
        (setq winner-mode t)
        (cond
         ((winner-hook-installed-p)
***************
*** 435,450 ****
        (message "Winner undo (%d / %d)"
                 winner-undo-counter
                 (1- (ring-length winner-pending-undo-ring)))))))
!  
!         
!  
  (defun winner-undo-this ()           ; The heart of winner undo.
!   (loop 
     (cond
      ((>= winner-undo-counter (ring-length winner-pending-undo-ring))
       (message "No further window configuration undo information")
       (return nil))
!  
      ((and                             ; If possible configuration
        (winner-set (ring-ref winner-pending-undo-ring
                            winner-undo-counter))
--- 435,450 ----
        (message "Winner undo (%d / %d)"
                 winner-undo-counter
                 (1- (ring-length winner-pending-undo-ring)))))))
! 
! 
! 
  (defun winner-undo-this ()           ; The heart of winner undo.
!   (loop
     (cond
      ((>= winner-undo-counter (ring-length winner-pending-undo-ring))
       (message "No further window configuration undo information")
       (return nil))
! 
      ((and                             ; If possible configuration
        (winner-set (ring-ref winner-pending-undo-ring
                            winner-undo-counter))
***************
*** 455,461 ****
       (return t))                      ; .. then everything is fine.
      (t ;; Otherwise, discharge it (and try the next one).
       (ring-remove winner-pending-undo-ring winner-undo-counter)))))
!  
  
  (defun winner-redo ()                 ; If you change your mind.
    "Restore a more recent window configuration saved by Winner mode."
--- 455,461 ----
       (return t))                      ; .. then everything is fine.
      (t ;; Otherwise, discharge it (and try the next one).
       (ring-remove winner-pending-undo-ring winner-undo-counter)))))
! 
  
  (defun winner-redo ()                 ; If you change your mind.
    "Restore a more recent window configuration saved by Winner mode."