Mercurial > emacs
annotate src/s/nextstep.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 | 3bd95f4f2941 |
children | e90d04cd455a c5406394f567 |
rev | line source |
---|---|
14184 | 1 /* Configuration file for the NeXTstep system. |
64769
6358e3c6075c
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64083
diff
changeset
|
2 Copyright (C) 1990, 1995, 2002, 2003, 2004, |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64769
diff
changeset
|
3 2005, 2006 Free Software Foundation, Inc. |
14184 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
9 the Free Software Foundation; either version 2, or (at your option) | |
10 any later version. | |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
64083 | 19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
20 Boston, MA 02110-1301, USA. */ | |
14184 | 21 |
22 #include "bsd4-3.h" | |
23 | |
24 /* SYSTEM_TYPE should indicate the kind of system you are using. | |
25 It sets the Lisp variable system-type. We'll need to undo the bsd one. */ | |
26 | |
27 #undef SYSTEM_TYPE | |
28 #define SYSTEM_TYPE "next-mach" | |
29 | |
30 #ifndef NeXT | |
31 #define NeXT | |
32 #endif | |
33 | |
34 | |
35 /* Data type of load average, as read out of kmem. */ | |
36 | |
37 #define LOAD_AVE_TYPE long | |
38 | |
39 /* Convert that into an integer that is 100 for a load average of 1.0 */ | |
40 | |
41 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) | |
42 | |
43 /* Defining KERNEL_FILE causes lossage because sys/file.h | |
44 stupidly gets confused by it. */ | |
45 #undef KERNEL_FILE | |
46 | |
47 #define SYSTEM_MALLOC | |
48 | |
49 #define environ _environ | |
50 | |
51 /* This should be true for recent NeXT systems. At least since 3.2. */ | |
52 #define HAVE_MACH_MACH_H | |
53 | |
54 #if 0 /* I think these are never used--let's see. -- rms. */ | |
55 /* Mask for address bits within a memory segment */ | |
56 | |
57 #define SEGSIZ 0x20000 | |
58 #define SEGMENT_MASK (SEGSIZ - 1) | |
59 | |
60 #define HAVE_UNIX_DOMAIN | |
61 | |
62 /* Conflicts in process.c between ioctl.h & tty.h use of t_foo fields */ | |
63 | |
64 #define NO_T_CHARS_DEFINES | |
65 | |
66 /* This avoids a problem in Xos.h when using co-Xist 3.01. */ | |
67 #define X_NOT_POSIX | |
68 #endif /* 0 */ | |
69 | |
70 /* Definitions for how to link. */ | |
71 | |
72 /* Link this program just by running cc. */ | |
73 #define ORDINARY_LINK | |
74 | |
16764
2aa0fbda89a9
(LD_SWITCH_SYSTEM): Use just -X.
Richard M. Stallman <rms@gnu.org>
parents:
15998
diff
changeset
|
75 #define LD_SWITCH_SYSTEM -X |
14184 | 76 |
77 /* Don't use -lc on the NeXT. */ | |
16764
2aa0fbda89a9
(LD_SWITCH_SYSTEM): Use just -X.
Richard M. Stallman <rms@gnu.org>
parents:
15998
diff
changeset
|
78 #ifdef NS_TARGET /* We use the dynamic libraries under Openstep for Mach 4.0 */ |
2aa0fbda89a9
(LD_SWITCH_SYSTEM): Use just -X.
Richard M. Stallman <rms@gnu.org>
parents:
15998
diff
changeset
|
79 #define LIB_STANDARD |
2aa0fbda89a9
(LD_SWITCH_SYSTEM): Use just -X.
Richard M. Stallman <rms@gnu.org>
parents:
15998
diff
changeset
|
80 #else |
14184 | 81 #define LIB_STANDARD -lsys_s |
16764
2aa0fbda89a9
(LD_SWITCH_SYSTEM): Use just -X.
Richard M. Stallman <rms@gnu.org>
parents:
15998
diff
changeset
|
82 #endif |
2aa0fbda89a9
(LD_SWITCH_SYSTEM): Use just -X.
Richard M. Stallman <rms@gnu.org>
parents:
15998
diff
changeset
|
83 |
14184 | 84 #define LIB_MATH -lm |
85 | |
86 #define START_FILES pre-crt0.o | |
87 | |
88 #define LIB_X11_LIB -L/usr/lib/X11 -lX11 | |
89 | |
90 /* We don't have a g library either, so override the -lg LIBS_DEBUG switch */ | |
91 | |
92 #define LIBS_DEBUG | |
93 | |
94 /* We don't have a libgcc.a, so we can't let LIB_GCC default to -lgcc */ | |
95 | |
96 #define LIB_GCC | |
97 | |
98 /* Definitions for how to dump. */ | |
99 | |
100 #define UNEXEC unexnext.o | |
101 | |
102 /* start_of_text isn't actually used, so make it compile without error. */ | |
103 #define TEXT_START 0 | |
104 /* This seems to be right for end_of_text, but it may not be used anyway. */ | |
105 #define TEXT_END get_etext () | |
106 /* This seems to be right for end_of_data, but it may not be used anyway. */ | |
107 #define DATA_END get_edata () | |
21904
f1e5ca32f35d
(HAVE_STRING_H): Add #undef.
Richard M. Stallman <rms@gnu.org>
parents:
16798
diff
changeset
|
108 |
f1e5ca32f35d
(HAVE_STRING_H): Add #undef.
Richard M. Stallman <rms@gnu.org>
parents:
16798
diff
changeset
|
109 /* Don't include string.h--it causes trouble. */ |
f1e5ca32f35d
(HAVE_STRING_H): Add #undef.
Richard M. Stallman <rms@gnu.org>
parents:
16798
diff
changeset
|
110 #undef HAVE_STRING_H |
f1e5ca32f35d
(HAVE_STRING_H): Add #undef.
Richard M. Stallman <rms@gnu.org>
parents:
16798
diff
changeset
|
111 |
f1e5ca32f35d
(HAVE_STRING_H): Add #undef.
Richard M. Stallman <rms@gnu.org>
parents:
16798
diff
changeset
|
112 /* Tell emacs.c not to define abort. */ |
f1e5ca32f35d
(HAVE_STRING_H): Add #undef.
Richard M. Stallman <rms@gnu.org>
parents:
16798
diff
changeset
|
113 #define NO_ABORT |
52401 | 114 |
115 /* arch-tag: 5cd6fed4-a0be-4402-9349-85a80bc01d57 | |
116 (do not change this comment) */ |