Sync to HEAD

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

diff --git a/lisp/electric.el b/lisp/electric.el
index 87a151b..3d2bf14 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
@@ -144,12 +144,12 @@
         (buf (get-buffer buffer))
         (one-window (one-window-p t))
         (pop-up-windows t)
+        (pop-up-frames nil)
         (target-height)
         (lines))
     (if (not buf)
        (error "Buffer %s does not exist" buffer)
-      (save-excursion
-       (set-buffer buf)
+      (with-current-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))
@@ -160,7 +160,6 @@
       (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))))
@@ -175,4 +174,5 @@
 
 (provide 'electric)
 
+;;; arch-tag: dae045eb-dc2d-4fb7-9f27-9cc2ce277be8
 ;;; electric.el ends here