Mercurial > emacs
diff lisp/faces.el @ 83488:f47495b26508
Fix ediff problems. (Reported by Dan Nicolaescu.)
* lisp/subr.el (with-selected-frame): Make sure the current buffer is
restored as well.
* src/xfns.c (Fx_create_frame): Use `store_frame_param' to set
`window-system' frame parameter, and make sure it overrides any
user-supplied setting.
* src/xfns.c (x_icon): Disable redundant call to
`x_wm_set_window_state'. (Also applied in CVS.)
* lisp/faces.el (x-create-frame-with-faces): Don't make frame visible
until we are done setting up all its parameters.
* lisp/ediff-wind.el (ediff-setup-windows-automatic): New function.
(ediff-window-setup-function): Use it as default.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-528
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sun, 12 Mar 2006 04:12:31 +0000 |
| parents | b98066f4aa10 |
| children | f271076dab2d |
line wrap: on
line diff
--- a/lisp/faces.el Fri Mar 10 11:23:32 2006 +0000 +++ b/lisp/faces.el Sun Mar 12 04:12:31 2006 +0000 @@ -1734,14 +1734,14 @@ (x-handle-reverse-video frame parameters) (frame-set-background-mode frame) (face-set-after-frame-default frame) - (if (or (null frame-list) (null visibility-spec)) - (make-frame-visible frame) - (modify-frame-parameters frame (list visibility-spec))) ;; Arrange for the kill and yank functions to set and check the clipboard. (modify-frame-parameters frame '((interprogram-cut-function . x-select-text))) (modify-frame-parameters frame '((interprogram-paste-function . x-cut-buffer-or-selection-value))) + (if (or (null frame-list) (null visibility-spec)) + (make-frame-visible frame) + (modify-frame-parameters frame (list visibility-spec))) (setq success t)) (unless success (delete-frame frame)))