Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
be617367
Commit
be617367
authored
Feb 16, 2008
by
Glenn Morris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(Finternal_char_font): Fix compilation warning.
parent
790df309
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
src/ChangeLog
src/ChangeLog
+4
-0
src/fontset.c
src/fontset.c
+4
-1
No files found.
src/ChangeLog
View file @
be617367
2008-02-16 Glenn Morris <rgm@gnu.org>
* fontset.c (Finternal_char_font): Fix compilation warning.
2008-02-16 Eli Zaretskii <eliz@gnu.org>
* w32.c (init_user_info): Use TOKEN_USER and TOKEN_PRIMARY_GROUP
...
...
src/fontset.c
View file @
be617367
...
...
@@ -2065,10 +2065,13 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0,
struct
font
*
font
=
XSAVE_VALUE
(
font_object
)
->
pointer
;
unsigned
code
=
font
->
driver
->
encode_char
(
font
,
c
);
Lisp_Object
fontname
=
font_get_name
(
font_object
);
/* Assignment to EMACS_INT stops GCC whining about limited range
of data type. */
EMACS_INT
cod
=
code
;
if
(
code
==
FONT_INVALID_CODE
)
return
Qnil
;
if
(
cod
e
<=
MOST_POSITIVE_FIXNUM
)
if
(
cod
<=
MOST_POSITIVE_FIXNUM
)
return
Fcons
(
fontname
,
make_number
(
code
));
return
Fcons
(
fontname
,
Fcons
(
make_number
(
code
>>
16
),
make_number
(
code
&
0xFFFF
)));
...
...
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