(mpuz-try-letter): Use read-char to read digit.

[bpt/emacs.git] / lisp / window.el

diff --git a/lisp/window.el b/lisp/window.el
index fe36479..089b4f3 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1,11 +1,14 @@
-;; GNU Emacs window commands aside from those written in C.
-;; Copyright (C) 1985, 1989 Free Software Foundation, Inc.
+;;; windows.el --- GNU Emacs window commands aside from those written in C.
+
+;;; Copyright (C) 1985, 1989, 1992 Free Software Foundation, Inc.
+
+;; Maintainer: FSF
 
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -17,6 +20,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
 
 (defun count-windows (&optional minibuf)
    "Returns the number of visible windows.
@@ -35,16 +39,15 @@ even if it is active."
     (walk-windows (function (lambda (w)
                              (setq count (+ count 1))))
                  'nomini)
-    (let ((size (/ (screen-height) count)))
+    (let ((size (/ (frame-height) count)))
       (walk-windows (function (lambda (w)
                                (select-window w)
                                (enlarge-window (- size (window-height)))))
                    'nomini))))
 
-;;; Many people find the minimal-redisplay window splitting annoying,
-;;; so we make it an option. 
+;;; I think this should be the default; I think people will prefer it--rms.
 
-(defvar split-window-keep-point nil
+(defvar split-window-keep-point t
   "*If non-nil, split windows so that both windows keep the original
 value of point.  This is often more convenient for editing.
 If nil, split windows to minimize redisplay.  This is convenient on
@@ -106,21 +109,9 @@ ARG columns.  No arg means split equally."
   (interactive "p")
   (shrink-window arg t))
 
-(defun window-config-to-register (name)
-  "Save the current window configuration in register REG (a letter).
-It can be later retrieved using \\[M-x register-to-window-config]."
-  (interactive "cSave window configuration in register: ")
-  (set-register name (current-window-configuration)))
-
-(defun register-to-window-config (name)
-  "Restore (make current) the window configuration in register REG (a letter).
-Use with a register previously set with \\[window-config-to-register]."
-  (interactive "cRestore window configuration from register: ")
-  (set-window-configuration (get-register name)))
-
 (define-key ctl-x-map "2" 'split-window-vertically)
-(define-key ctl-x-map "5" 'split-window-horizontally)
-(define-key ctl-x-map "6" 'window-config-to-register)
-(define-key ctl-x-map "7" 'register-to-window-config)
+(define-key ctl-x-map "3" 'split-window-horizontally)
 (define-key ctl-x-map "}" 'enlarge-window-horizontally)
 (define-key ctl-x-map "{" 'shrink-window-horizontally)
+
+;;; windows.el ends here