Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ff7a2223
Commit
ff7a2223
authored
Feb 08, 2008
by
Stefan Monnier
Browse files
(free_face_fontset): Use FONTSET_FROM_ID.
(syms_of_fontset): Use ASET.
parent
68b587a6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
src/ChangeLog
src/ChangeLog
+3
-0
src/fontset.c
src/fontset.c
+2
-2
No files found.
src/ChangeLog
View file @
ff7a2223
2008-02-08 Stefan Monnier <monnier@iro.umontreal.ca>
* fontset.c (free_face_fontset): Use FONTSET_FROM_ID.
(syms_of_fontset): Use ASET.
* fns.c (concat): Move side effect outside of macro call.
(hash_clear): Use ASET.
...
...
src/fontset.c
View file @
ff7a2223
...
...
@@ -923,7 +923,7 @@ free_face_fontset (f, face)
{
Lisp_Object
fontset
;
fontset
=
AREF
(
Vfontset_table
,
face
->
fontset
);
fontset
=
FONTSET_FROM_ID
(
face
->
fontset
);
xassert
(
!
NILP
(
fontset
)
&&
!
BASE_FONTSET_P
(
fontset
));
xassert
(
f
==
XFRAME
(
FONTSET_FRAME
(
fontset
)));
ASET
(
Vfontset_table
,
face
->
fontset
,
Qnil
);
...
...
@@ -2432,7 +2432,7 @@ syms_of_fontset ()
FONTSET_ID
(
Vdefault_fontset
)
=
make_number
(
0
);
FONTSET_NAME
(
Vdefault_fontset
)
=
build_string
(
"-*-*-*-*-*-*-*-*-*-*-*-*-fontset-default"
);
A
REF
(
Vfontset_table
,
0
)
=
Vdefault_fontset
;
A
SET
(
Vfontset_table
,
0
,
Vdefault_fontset
)
;
next_fontset_id
=
1
;
auto_fontset_alist
=
Qnil
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment