aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2007-11-21 20:37:22 +0000
committerStefan Monnier2007-11-21 20:37:22 +0000
commitcb01ce3f055a415bbe4f2be4fbd0e4a7f320d688 (patch)
treedaf878c97aea25bbb1b08c67f388b64a201d6bf0
parentb6ddf8d7735083c582d9c354c96ff15b670dd02f (diff)
downloademacs-cb01ce3f055a415bbe4f2be4fbd0e4a7f320d688.tar.gz
emacs-cb01ce3f055a415bbe4f2be4fbd0e4a7f320d688.zip
Fit within 80 columns.
-rw-r--r--lisp/frame.el13
1 files changed, 9 insertions, 4 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index 1c11829475b..305f5ebff80 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -292,8 +292,9 @@ there (in decreasing order of priority)."
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))
@@ -714,7 +715,8 @@ setup is for focus to follow the pointer."
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)))
@@ -725,7 +727,10 @@ setup is for focus to follow the pointer."
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)