(gdb-registers-mode): Let gdbmi use

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

diff --git a/lisp/electric.el b/lisp/electric.el
index d4678a7..18a4d83 100644 (file)
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -1,6 +1,6 @@
 ;;; electric.el --- window maker and Command loop for `electric' modes
 
-;; Copyright (C) 1985, 1986, 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1995, 2004 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
@@ -55,8 +55,8 @@
                              &optional prompt inhibit-quit
                                        loop-function loop-state)
 
-  (let (cmd 
-        (err nil) 
+  (let (cmd
+        (err nil)
         (prompt-string prompt))
     (while t
       (if (not (or (stringp prompt) (eq prompt nil) (eq prompt 'noprompt)))
@@ -123,7 +123,7 @@
   (ding)
   (throw return-tag nil))
 
-;; This function is like pop-to-buffer, sort of. 
+;; This function is like pop-to-buffer, sort of.
 ;; The algorithm is
 ;; If there is a window displaying buffer
 ;;     Select it
@@ -144,35 +144,21 @@
         (buf (get-buffer buffer))
         (one-window (one-window-p t))
         (pop-up-windows t)
-        (target-height)
-        (lines))
+        (pop-up-frames nil))
     (if (not buf)
        (error "Buffer %s does not exist" buffer)
-      (save-excursion
-       (set-buffer buf)
-       (setq lines (count-lines (point-min) (point-max)))
-       (setq target-height
-             (min (max (if max-height (min max-height (1+ lines)) (1+ lines))
-                       window-min-height)
-                  (save-window-excursion
-                    (delete-other-windows)
-                    (1- (window-height (selected-window)))))))
       (cond ((and (eq (window-buffer win) buf))
             (select-window win))
            (one-window
-            (goto-char (window-start win))
             (pop-to-buffer buffer)
-            (setq win (selected-window))
-            (enlarge-window (- target-height (window-height win))))
+            (setq win (selected-window)))
            (t
             (switch-to-buffer buf)))
-      (if (and (not max-height)
-              (> target-height (window-height (selected-window))))
-         (progn (goto-char (window-start win))
-                (enlarge-window (- target-height (window-height win)))))
+      (fit-window-to-buffer win max-height)
       (goto-char (point-min))
       win)))
 
 (provide 'electric)
 
+;;; arch-tag: dae045eb-dc2d-4fb7-9f27-9cc2ce277be8
 ;;; electric.el ends here