Mercurial > emacs
comparison lisp/frame.el @ 82984:3b1f99f17618
Merged in changes from CVS head
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-5
Add =cvs-sync-make-log script
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-6
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-7
Use absolute tla-tools filenames in =cvs-sync-make-log
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-8
Use proper arch-tag: syntax for lispintro/texinfo.tex
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-9
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-24
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Tue, 30 Dec 2003 17:05:05 +0000 |
parents | fe9b37bee5f7 45cc6f8abd8d |
children | 2ecd1f669db9 |
comparison
equal
deleted
inserted
replaced
82983:21720c013048 | 82984:3b1f99f17618 |
---|---|
83 (symbol :tag "Parameter") | 83 (symbol :tag "Parameter") |
84 (sexp :tag "Value"))) | 84 (sexp :tag "Value"))) |
85 :group 'frames) | 85 :group 'frames) |
86 | 86 |
87 (setq pop-up-frame-function | 87 (setq pop-up-frame-function |
88 (function (lambda () | 88 ;; Using `function' here caused some sort of problem. |
89 (make-frame pop-up-frame-alist)))) | 89 '(lambda () |
90 (make-frame pop-up-frame-alist))) | |
90 | 91 |
91 (defcustom special-display-frame-alist | 92 (defcustom special-display-frame-alist |
92 '((height . 14) (width . 80) (unsplittable . t)) | 93 '((height . 14) (width . 80) (unsplittable . t)) |
93 "*Alist of frame parameters used when creating special frames. | 94 "*Alist of frame parameters used when creating special frames. |
94 Special frames are used for buffers whose names are in | 95 Special frames are used for buffers whose names are in |
333 (newparms (list (cons 'height (- height lines)))) | 334 (newparms (list (cons 'height (- height lines)))) |
334 (initial-top (cdr (assq 'top | 335 (initial-top (cdr (assq 'top |
335 frame-initial-geometry-arguments))) | 336 frame-initial-geometry-arguments))) |
336 (top (frame-parameter frame-initial-frame 'top))) | 337 (top (frame-parameter frame-initial-frame 'top))) |
337 (when (and (consp initial-top) (eq '- (car initial-top))) | 338 (when (and (consp initial-top) (eq '- (car initial-top))) |
338 (setq newparms | 339 (let ((adjusted-top |
339 (append newparms | 340 (cond ((and (consp top) |
340 `((top . ,(+ top (* lines char-height)))) | 341 (eq '+ (car top))) |
341 nil))) | 342 (list '+ |
343 (+ (cadr top) | |
344 (* lines char-height)))) | |
345 ((and (consp top) | |
346 (eq '- (car top))) | |
347 (list '- | |
348 (- (cadr top) | |
349 (* lines char-height)))) | |
350 (t (+ top (* lines char-height)))))) | |
351 (setq newparms | |
352 (append newparms | |
353 `((top . ,adjusted-top)) | |
354 nil)))) | |
342 (modify-frame-parameters frame-initial-frame newparms) | 355 (modify-frame-parameters frame-initial-frame newparms) |
343 (tool-bar-mode -1))))) | 356 (tool-bar-mode -1))))) |
344 | 357 |
345 ;; The initial frame we create above always has a minibuffer. | 358 ;; The initial frame we create above always has a minibuffer. |
346 ;; If the user wants to remove it, or make it a minibuffer-only | 359 ;; If the user wants to remove it, or make it a minibuffer-only |