Mercurial > emacs
view src/s/sol2-4.h @ 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 | 695cf19ef79e |
children | 375f2633d815 cb1bfa1dca4f |
line wrap: on
line source
/* Handle Solaris 2.4. */ #include "sol2-3.h" #define SOLARIS2_4 /* Get rid of -traditional and let const really do its thing. */ #ifdef __GNUC__ #undef C_SWITCH_SYSTEM #undef const #endif /* __GNUC__ */ #undef LD_SWITCH_SYSTEM /* `#ifdef USE_MOTIF' won't work here, since USE_MOTIF isn't defined yet. Instead, dynamically check whether USE_MOTIF expands to something. */ #define NOT_USING_MOTIF { set x USE_MOTIF; test "$$2" = "USE_MOTIF"; } #ifndef __GNUC__ #define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib LD_SWITCH_X_SITE_AUX \ `NOT_USING_MOTIF || echo ' -R/usr/dt/lib'` #else /* GCC */ /* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX has anything in it. It can be empty. This works ok in temacs. */ #define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib \ `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` \ `NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'` #endif /* GCC */ /* Gregory Neil Shapiro <gshapiro@hhmi.org> reports the Motif header files are in this directory on Solaris 2.4. */ #define C_SWITCH_X_SYSTEM -I/usr/dt/include /* arch-tag: 6f0de37b-cfda-427a-a5ae-b83ed54aaae7 (do not change this comment) */