Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
83487:414faf8dce4e | 83488:f47495b26508 |
---|---|
1732 (progn | 1732 (progn |
1733 (x-setup-function-keys frame) | 1733 (x-setup-function-keys frame) |
1734 (x-handle-reverse-video frame parameters) | 1734 (x-handle-reverse-video frame parameters) |
1735 (frame-set-background-mode frame) | 1735 (frame-set-background-mode frame) |
1736 (face-set-after-frame-default frame) | 1736 (face-set-after-frame-default frame) |
1737 (if (or (null frame-list) (null visibility-spec)) | |
1738 (make-frame-visible frame) | |
1739 (modify-frame-parameters frame (list visibility-spec))) | |
1740 ;; Arrange for the kill and yank functions to set and check the clipboard. | 1737 ;; Arrange for the kill and yank functions to set and check the clipboard. |
1741 (modify-frame-parameters | 1738 (modify-frame-parameters |
1742 frame '((interprogram-cut-function . x-select-text))) | 1739 frame '((interprogram-cut-function . x-select-text))) |
1743 (modify-frame-parameters | 1740 (modify-frame-parameters |
1744 frame '((interprogram-paste-function . x-cut-buffer-or-selection-value))) | 1741 frame '((interprogram-paste-function . x-cut-buffer-or-selection-value))) |
1742 (if (or (null frame-list) (null visibility-spec)) | |
1743 (make-frame-visible frame) | |
1744 (modify-frame-parameters frame (list visibility-spec))) | |
1745 (setq success t)) | 1745 (setq success t)) |
1746 (unless success | 1746 (unless success |
1747 (delete-frame frame))) | 1747 (delete-frame frame))) |
1748 frame)) | 1748 frame)) |
1749 | 1749 |