Mercurial > emacs
view src/s/esix5r4.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 |
line wrap: on
line source
/* Definitions for ESIX System V 4.0.4, a variant of V.4 for the 386. */ /* Redone by zircon!joe@uunet.uu.net (Joe Kelsey). */ #include "usg5-4.h" #define SYSTEM_MALLOC 1 #if defined (HAVE_XFREE386) # undef LIB_STANDARD # define LIB_STANDARD -lc #else # define LIB_X11_LIB -lsocket -lc -lX11 # undef LIB_STANDARD # ifdef ORDINARY_LINK # define LIB_STANDARD -lnsl -lns -lelf /usr/ucblib/libucb.a # else # define LIB_STANDARD -lnsl -lns -lelf /usr/ucblib/libucb.a /usr/ccs/lib/crtn.o # endif /* Resolve BSD string functions in X Window library from libucb.a. */ # define BSTRING /* zircon!joe says this makes X windows work. */ # define BROKEN_FIONREAD #endif /* arch-tag: 2d314ae9-0357-4ddf-96e5-cf821071ba4b (do not change this comment) */