Mercurial > emacs
annotate src/s/irix6-0.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 | 746805373b79 375f2633d815 |
rev | line source |
---|---|
10737 | 1 #include "irix5-0.h" |
2 | |
3 /* Irix 6 tries to do 64 bits, but doesn't do it fully, | |
4 so inhibit that. */ | |
5 #define IRIX_FORCE_32_BITS | |
12497
a48e520afeb6
[!__GNUC__] (LD_SWITCH_SYSTEM): Define this.
Richard M. Stallman <rms@gnu.org>
parents:
10737
diff
changeset
|
6 |
a48e520afeb6
[!__GNUC__] (LD_SWITCH_SYSTEM): Define this.
Richard M. Stallman <rms@gnu.org>
parents:
10737
diff
changeset
|
7 #ifndef __GNUC__ |
a48e520afeb6
[!__GNUC__] (LD_SWITCH_SYSTEM): Define this.
Richard M. Stallman <rms@gnu.org>
parents:
10737
diff
changeset
|
8 #define LD_SWITCH_SYSTEM -32 |
a48e520afeb6
[!__GNUC__] (LD_SWITCH_SYSTEM): Define this.
Richard M. Stallman <rms@gnu.org>
parents:
10737
diff
changeset
|
9 #endif |
13787
434b944a78c9
(C_SWITCH_SYSTEM): #undef this if THIS_IS_MAKEFILE.
Karl Heuer <kwzh@gnu.org>
parents:
12497
diff
changeset
|
10 |
434b944a78c9
(C_SWITCH_SYSTEM): #undef this if THIS_IS_MAKEFILE.
Karl Heuer <kwzh@gnu.org>
parents:
12497
diff
changeset
|
11 /* This macro definition, which we inherited from irix5-0.h, |
434b944a78c9
(C_SWITCH_SYSTEM): #undef this if THIS_IS_MAKEFILE.
Karl Heuer <kwzh@gnu.org>
parents:
12497
diff
changeset
|
12 is needed in configure on Irix 5, but gets in the way there |
434b944a78c9
(C_SWITCH_SYSTEM): #undef this if THIS_IS_MAKEFILE.
Karl Heuer <kwzh@gnu.org>
parents:
12497
diff
changeset
|
13 on Irix 6. So get rid of it except in Makefile.in where we need it. */ |
434b944a78c9
(C_SWITCH_SYSTEM): #undef this if THIS_IS_MAKEFILE.
Karl Heuer <kwzh@gnu.org>
parents:
12497
diff
changeset
|
14 #ifndef THIS_IS_MAKEFILE |
434b944a78c9
(C_SWITCH_SYSTEM): #undef this if THIS_IS_MAKEFILE.
Karl Heuer <kwzh@gnu.org>
parents:
12497
diff
changeset
|
15 #undef C_SWITCH_SYSTEM |
434b944a78c9
(C_SWITCH_SYSTEM): #undef this if THIS_IS_MAKEFILE.
Karl Heuer <kwzh@gnu.org>
parents:
12497
diff
changeset
|
16 #endif |
15730 | 17 |
48082 | 18 /* The only supported 32-bit configuration of GCC under IRIX6.x produces |
15777
d6eb0b865cd2
[__GNUC__] (C_DEBUG_SWITCH): Define as -g3.
Richard M. Stallman <rms@gnu.org>
parents:
15730
diff
changeset
|
19 n32 MIPS ABI binaries and also supports -g. */ |
d6eb0b865cd2
[__GNUC__] (C_DEBUG_SWITCH): Define as -g3.
Richard M. Stallman <rms@gnu.org>
parents:
15730
diff
changeset
|
20 #ifdef __GNUC__ |
d6eb0b865cd2
[__GNUC__] (C_DEBUG_SWITCH): Define as -g3.
Richard M. Stallman <rms@gnu.org>
parents:
15730
diff
changeset
|
21 #undef C_DEBUG_SWITCH |
d6eb0b865cd2
[__GNUC__] (C_DEBUG_SWITCH): Define as -g3.
Richard M. Stallman <rms@gnu.org>
parents:
15730
diff
changeset
|
22 #define C_DEBUG_SWITCH -g |
d6eb0b865cd2
[__GNUC__] (C_DEBUG_SWITCH): Define as -g3.
Richard M. Stallman <rms@gnu.org>
parents:
15730
diff
changeset
|
23 #endif |
d6eb0b865cd2
[__GNUC__] (C_DEBUG_SWITCH): Define as -g3.
Richard M. Stallman <rms@gnu.org>
parents:
15730
diff
changeset
|
24 |
15730 | 25 #undef SA_RESTART |
16377
907b62ddf042
(ospeed): New #undef to counteract that definition.
Richard M. Stallman <rms@gnu.org>
parents:
15777
diff
changeset
|
26 |
18916 | 27 /* It turns out that the #define in irix5-0.h is needed in Irix 6 as well. */ |
28 #if 0 | |
48082 | 29 /* Cancel the #define that is in irix5-0.h. */ |
16377
907b62ddf042
(ospeed): New #undef to counteract that definition.
Richard M. Stallman <rms@gnu.org>
parents:
15777
diff
changeset
|
30 #undef ospeed |
18916 | 31 #endif |
23229 | 32 |
35151 | 33 #undef TIOCSIGSEND |
48558 | 34 |
35 /* Tested on Irix 6.5. SCM worked on earlier versions. */ | |
36 #define GC_SETJMP_WORKS 1 | |
37 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS | |
52401 | 38 |
39 /* arch-tag: a775e465-a619-4655-a58f-5982aad0c624 | |
40 (do not change this comment) */ |