1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00

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

This commit is contained in:
Stefan Monnier 2004-03-26 15:15:07 +00:00
parent 411def8eb0
commit e09dc079db

View File

@ -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))