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
2930d117
Commit
2930d117
authored
Feb 16, 2008
by
Eli Zaretskii
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(Ffont_fill_gstring, Fget_font_glyphs): Fix compilation warnings.
parent
4cc1c806
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
6 deletions
+18
-6
src/ChangeLog
src/ChangeLog
+5
-0
src/font.c
src/font.c
+13
-6
No files found.
src/ChangeLog
View file @
2930d117
2008-02-16 Eli Zaretskii <eliz@gnu.org>
* font.c (Ffont_fill_gstring, Fget_font_glyphs): Fix compilation
warnings.
2008-02-15 Dan Nicolaescu <dann@ics.uci.edu>
* .gdbinit: Don't set `args', it breaks gdb --args.
...
...
src/font.c
View file @
2930d117
...
...
@@ -3494,10 +3494,13 @@ FONT-OBJECT may be nil if GSTRING already already contains one. */)
for (i = 0; i < len; i++)
{
Lisp_Object g = LGSTRING_GLYPH (gstring, i);
/* Shut up GCC warning in comparison with
MOST_POSITIVE_FIXNUM below. */
EMACS_INT cod;
c = STRING_CHAR_ADVANCE (p);
code = font->driver->encode_char (font, c);
if (cod
e
> MOST_POSITIVE_FIXNUM || code == FONT_INVALID_CODE)
cod =
code = font->driver->encode_char (font, c);
if (cod > MOST_POSITIVE_FIXNUM || code == FONT_INVALID_CODE)
break;
LGLYPH_SET_FROM (g, i);
LGLYPH_SET_TO (g, i);
...
...
@@ -3520,10 +3523,13 @@ FONT-OBJECT may be nil if GSTRING already already contains one. */)
for (i = 0; i < len; i++)
{
Lisp_Object g = LGSTRING_GLYPH (gstring, i);
/* Shut up GCC warning in comparison with
MOST_POSITIVE_FIXNUM below. */
EMACS_INT cod;
FETCH_CHAR_ADVANCE (c, pos, pos_byte);
code = font->driver->encode_char (font, c);
if (cod
e
> MOST_POSITIVE_FIXNUM || code == FONT_INVALID_CODE)
cod =
code = font->driver->encode_char (font, c);
if (cod > MOST_POSITIVE_FIXNUM || code == FONT_INVALID_CODE)
break;
LGLYPH_SET_FROM (g, i);
LGLYPH_SET_TO (g, i);
...
...
@@ -3961,13 +3967,14 @@ Each element is a vector [GLYPH-CODE LBEARING RBEARING WIDTH ASCENT DESCENT]. *
Lisp_Object val;
int c = XINT (ch);
unsigned code;
EMACS_INT cod;
struct font_metrics metrics;
code = font->driver->encode_char (font, c);
cod =
code = font->driver->encode_char (font, c);
if (code == FONT_INVALID_CODE)
continue;
val = Fmake_vector (make_number (6), Qnil);
if (cod
e
<= MOST_POSITIVE_FIXNUM)
if (cod <= MOST_POSITIVE_FIXNUM)
ASET (val, 0, make_number (code));
else
ASET (val, 0, Fcons (make_number (code >> 16),
...
...
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