HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up SIGCHLD handling a bit.
[bpt/emacs.git]
/
src
/
fontset.c
diff --git
a/src/fontset.c
b/src/fontset.c
index
b7f3e46
..
2f6313c
100644
(file)
--- a/
src/fontset.c
+++ b/
src/fontset.c
@@
-179,10
+179,6
@@
static int next_fontset_id;
font for each character. */
static Lisp_Object Vdefault_fontset;
font for each character. */
static Lisp_Object Vdefault_fontset;
-/* Check if any window system is used now. */
-void (*check_window_system_func) (void);
-
-
/* Prototype declarations for static functions. */
static Lisp_Object make_fontset (Lisp_Object, Lisp_Object, Lisp_Object);
/* Prototype declarations for static functions. */
static Lisp_Object make_fontset (Lisp_Object, Lisp_Object, Lisp_Object);
@@
-271,7
+267,8
@@
set_fontset_fallback (Lisp_Object fontset, Lisp_Object fallback)
/* Macros for FONT-DEF and RFONT-DEF of fontset. */
#define FONT_DEF_NEW(font_def, font_spec, encoding, repertory) \
do { \
/* Macros for FONT-DEF and RFONT-DEF of fontset. */
#define FONT_DEF_NEW(font_def, font_spec, encoding, repertory) \
do { \
- (font_def) = Fmake_vector (make_number (3), (font_spec)); \
+ (font_def) = make_uninit_vector (3); \
+ ASET ((font_def), 0, font_spec); \
ASET ((font_def), 1, encoding); \
ASET ((font_def), 2, repertory); \
} while (0)
ASET ((font_def), 1, encoding); \
ASET ((font_def), 2, repertory); \
} while (0)
@@
-1212,7
+1209,7
@@
If REGEXPP is non-nil, PATTERN is a regular expression. */)
Lisp_Object fontset;
int id;
Lisp_Object fontset;
int id;
-
(*check_window_system_func) (
);
+
check_window_system (NULL
);
CHECK_STRING (pattern);
CHECK_STRING (pattern);
@@
-1591,7
+1588,7
@@
appended. By default, FONT-SPEC overrides the previous settings. */)
{
Lisp_Object arg;
{
Lisp_Object arg;
- arg =
Fmake_vector (make_number (5), Qnil
);
+ arg =
make_uninit_vector (5
);
ASET (arg, 0, fontset);
ASET (arg, 1, font_def);
ASET (arg, 2, add);
ASET (arg, 0, fontset);
ASET (arg, 1, font_def);
ASET (arg, 2, add);
@@
-1918,8
+1915,7
@@
format is the same as above. */)
Lisp_Object val, elt;
int c, i, j, k;
Lisp_Object val, elt;
int c, i, j, k;
- (*check_window_system_func) ();
-
+ check_window_system (NULL);
fontset = check_fontset_name (fontset, &frame);
/* Recode fontsets realized on FRAME from the base fontset FONTSET
fontset = check_fontset_name (fontset, &frame);
/* Recode fontsets realized on FRAME from the base fontset FONTSET