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

[Stefan Monnier]

Index: emacs/lisp/window.el
diff -c emacs/lisp/window.el:1.86 emacs/lisp/window.el:1.87
*** emacs/lisp/window.el:1.86   Mon Apr  1 08:39:23 2002
--- emacs/lisp/window.el        Wed Aug 14 20:34:04 2002
***************
*** 239,245 ****
                                          (setq done nil))))))
                        'nomini))))))
  
! ;;; I think this should be the default; I think people will prefer it--rms.
  (defcustom split-window-keep-point t
    "*If non-nil, split windows keeps the original point in both children.
  This is often more convenient for editing.
--- 239,245 ----
                                          (setq done nil))))))
                        'nomini))))))
  
! ;; I think this should be the default; I think people will prefer it--rms.
  (defcustom split-window-keep-point t
    "*If non-nil, split windows keeps the original point in both children.
  This is often more convenient for editing.
***************
*** 300,312 ****
  (defvar view-return-to-alist)
  
  (defun split-window-save-restore-data (new-w old-w)
!   (save-excursion
!     (set-buffer (window-buffer))
      (if view-mode
        (let ((old-info (assq old-w view-return-to-alist)))
!         (setq view-return-to-alist
!               (cons (cons new-w (cons (and old-info (car (cdr old-info))) t))
!                     view-return-to-alist))))
      new-w))
  
  (defun split-window-horizontally (&optional arg)
--- 300,310 ----
  (defvar view-return-to-alist)
  
  (defun split-window-save-restore-data (new-w old-w)
!   (with-current-buffer (window-buffer)
      (if view-mode
        (let ((old-info (assq old-w view-return-to-alist)))
!         (push (cons new-w (cons (and old-info (car (cdr old-info))) t))
!               view-return-to-alist)))
      new-w))
  
  (defun split-window-horizontally (&optional arg)
***************
*** 582,589 ****
    "Handle select-window events."
    (interactive "e")
    (let ((window (posn-window (event-start event))))
!     (if (or (not (window-minibuffer-p window))
!           (minibuffer-window-active-p window))
        (select-window window))))
  
  (define-key ctl-x-map "2" 'split-window-vertically)
--- 580,588 ----
    "Handle select-window events."
    (interactive "e")
    (let ((window (posn-window (event-start event))))
!     (if (and (window-live-p window)
!            (or (not (window-minibuffer-p window))
!                (minibuffer-window-active-p window)))
        (select-window window))))
  
  (define-key ctl-x-map "2" 'split-window-vertically)