Mercurial > emacs
comparison lisp/frame.el @ 86284:d0c1a4ea2562
Fit within 80 columns.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 21 Nov 2007 20:37:22 +0000 |
| parents | a8503aaf3a82 |
| children | 8a7ed478f7bc |
comparison
equal
deleted
inserted
replaced
| 86283:dcb8172071f2 | 86284:d0c1a4ea2562 |
|---|---|
| 290 ;; and thus the current buffer. Protect against that. We don't | 290 ;; and thus the current buffer. Protect against that. We don't |
| 291 ;; want to use save-excursion here, because that may also try to set | 291 ;; want to use save-excursion here, because that may also try to set |
| 292 ;; the buffer of the selected window, which fails when the selected | 292 ;; the buffer of the selected window, which fails when the selected |
| 293 ;; window is the minibuffer. | 293 ;; window is the minibuffer. |
| 294 (let ((old-buffer (current-buffer)) | 294 (let ((old-buffer (current-buffer)) |
| 295 (window-system-frame-alist (cdr (assq initial-window-system | 295 (window-system-frame-alist |
| 296 window-system-default-frame-alist)))) | 296 (cdr (assq initial-window-system |
| 297 window-system-default-frame-alist)))) | |
| 297 | 298 |
| 298 (when (and frame-notice-user-settings | 299 (when (and frame-notice-user-settings |
| 299 (null frame-initial-frame)) | 300 (null frame-initial-frame)) |
| 300 ;; This case happens when we don't have a window system, and | 301 ;; This case happens when we don't have a window system, and |
| 301 ;; also for MS-DOS frames. | 302 ;; also for MS-DOS frames. |
| 712 (let* ((w (cond | 713 (let* ((w (cond |
| 713 ((assq 'terminal parameters) | 714 ((assq 'terminal parameters) |
| 714 (let ((type (terminal-live-p (cdr (assq 'terminal parameters))))) | 715 (let ((type (terminal-live-p (cdr (assq 'terminal parameters))))) |
| 715 (cond | 716 (cond |
| 716 ((eq type t) nil) | 717 ((eq type t) nil) |
| 717 ((eq type nil) (error "Terminal %s does not exist" (cdr (assq 'terminal parameters)))) | 718 ((eq type nil) (error "Terminal %s does not exist" |
| 719 (cdr (assq 'terminal parameters)))) | |
| 718 (t type)))) | 720 (t type)))) |
| 719 ((assq 'window-system parameters) | 721 ((assq 'window-system parameters) |
| 720 (cdr (assq 'window-system parameters))) | 722 (cdr (assq 'window-system parameters))) |
| 721 (t window-system))) | 723 (t window-system))) |
| 722 (frame-creation-function (cdr (assq w frame-creation-function-alist))) | 724 (frame-creation-function (cdr (assq w frame-creation-function-alist))) |
| 723 (oldframe (selected-frame)) | 725 (oldframe (selected-frame)) |
| 724 frame) | 726 frame) |
| 725 (unless frame-creation-function | 727 (unless frame-creation-function |
| 726 (error "Don't know how to create a frame on window system %s" w)) | 728 (error "Don't know how to create a frame on window system %s" w)) |
| 727 (run-hooks 'before-make-frame-hook) | 729 (run-hooks 'before-make-frame-hook) |
| 728 (setq frame (funcall frame-creation-function (append parameters (cdr (assq w window-system-default-frame-alist))))) | 730 (setq frame |
| 731 (funcall frame-creation-function | |
| 732 (append parameters | |
| 733 (cdr (assq w window-system-default-frame-alist))))) | |
| 729 (normal-erase-is-backspace-setup-frame frame) | 734 (normal-erase-is-backspace-setup-frame frame) |
| 730 ;; Inherit the original frame's parameters. | 735 ;; Inherit the original frame's parameters. |
| 731 (dolist (param frame-inherited-parameters) | 736 (dolist (param frame-inherited-parameters) |
| 732 (unless (assq param parameters) ;Overridden by explicit parameters. | 737 (unless (assq param parameters) ;Overridden by explicit parameters. |
| 733 (let ((val (frame-parameter oldframe param))) | 738 (let ((val (frame-parameter oldframe param))) |