From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 26 Mar 2004 15:15:07 +0000 (+0000)
Subject: (Electric-pop-up-window): Avoid popping up a new frame.
X-Git-Tag: ttn-vms-21-2-B4~7086
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e09dc079db34ea6a3e49eba722edc13ca76ee593;p=emacs.git

(Electric-pop-up-window): Avoid popping up a new frame.
---

diff --git a/lisp/electric.el b/lisp/electric.el
index 6df74eac6ef..3d2bf140c8c 100644
--- 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))