(byte-compile-file): Don't write output if error.

[gnu-emacs] / lisp / window.el

diff --git a/lisp/window.el b/lisp/window.el
index 25d90e777cf7a1e1c2604ae57af4bc2d617ef893..840035a4af8bbc4aeed5026c9e2f4bf4088b3895 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1,6 +1,9 @@
 ;;; 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
@@ -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,7 +39,7 @@ 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)))))
@@ -105,23 +109,42 @@ 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)))
-
+(defun shrink-window-if-larger-than-buffer (&optional window)
+  "Shrink the WINDOW to be as small as possible to display its contents.  Do
+nothing if only one window is displayed or if the buffer contains more lines
+than the present window height."
+  (save-excursion
+    (set-buffer (window-buffer window))
+    (let ((w (selected-window)) ;save-window-excursion can't win
+         (buffer-file-name buffer-file-name)
+         (p (point))
+         (n 0)
+         (window-min-height 0)
+         (buffer-read-only nil)
+         (modified (buffer-modified-p))
+         (buffer (current-buffer)))
+      (unwind-protect
+         (progn
+           (select-window (or window w))
+           (goto-char (point-min))
+           (while (pos-visible-in-window-p (point-max))
+             ;; defeat file locking... don't try this at home, kids!
+             (setq buffer-file-name nil)
+             (insert ?\n) (setq n (1+ n)))
+           (if (> n 0) (shrink-window (1- n))))
+       (delete-region (point-min) (point))
+       (set-buffer-modified-p modified)
+       (goto-char p)
+       (select-window w)
+       ;; Make sure we unbind buffer-read-only
+       ;; with the proper current buffer.
+       (set-buffer buffer)))))
+      
 (define-key ctl-x-map "2" 'split-window-vertically)
 (define-key ctl-x-map "3" '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 "}" 'enlarge-window-horizontally)
 (define-key ctl-x-map "{" 'shrink-window-horizontally)
+(define-key ctl-x-map "-" 'shrink-window-if-larger-than-buffer)
+(define-key ctl-x-map "+" 'balance-windows)
 
 ;;; windows.el ends here