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
8510724d
Commit
8510724d
authored
Feb 11, 2009
by
Juanma Barranquero
Browse files
Remove spurious semicolons.
parent
abab01f2
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
28 additions
and
18 deletions
+28
-18
src/ChangeLog
src/ChangeLog
+10
-0
src/casetab.c
src/casetab.c
+1
-1
src/coding.c
src/coding.c
+1
-1
src/font.c
src/font.c
+1
-1
src/fontset.c
src/fontset.c
+3
-3
src/ftfont.c
src/ftfont.c
+2
-2
src/xfont.c
src/xfont.c
+4
-4
src/xftfont.c
src/xftfont.c
+6
-6
No files found.
src/ChangeLog
View file @
8510724d
2009-02-11 Juanma Barranquero <lekktu@gmail.com>
* casetab.c (init_casetab_once):
* coding.c (ALLOC_CONVERSION_WORK_AREA):
* font.c (font_update_lface):
* fontset.c (Fnew_fontset):
* ftfont.c (ftfont_drive_otf):
* xfont.c (xfont_open):
* xftfont.c (xftfont_get_xft_draw): Remove spurious semicolons.
2009-02-11 Stefan Monnier <monnier@iro.umontreal.ca>
* fileio.c (Fwrite_region): !NILP -> CONSP.
...
...
src/casetab.c
View file @
8510724d
...
...
@@ -285,7 +285,7 @@ init_casetab_once ()
{
int
c
=
((
i
>=
'A'
&&
i
<=
'Z'
)
?
i
+
(
'a'
-
'A'
)
:
((
i
>=
'a'
&&
i
<=
'z'
)
?
i
+
(
'A'
-
'a'
)
:
i
));
;
:
i
));
CHAR_TABLE_SET
(
up
,
i
,
make_number
(
c
));
}
...
...
src/coding.c
View file @
8510724d
...
...
@@ -6626,7 +6626,7 @@ produce_charset (coding, charbuf, pos)
#define ALLOC_CONVERSION_WORK_AREA(coding) \
do { \
int size = CHARBUF_SIZE;
;
\
int size = CHARBUF_SIZE; \
\
coding->charbuf = NULL; \
while (size > 1024) \
...
...
src/font.c
View file @
8510724d
...
...
@@ -3132,7 +3132,7 @@ font_update_lface (f, attrs)
if (! NILP (AREF (spec, FONT_WEIGHT_INDEX)))
attrs[LFACE_WEIGHT_INDEX] = FONT_WEIGHT_FOR_FACE (spec);
if (! NILP (AREF (spec, FONT_SLANT_INDEX)))
attrs[LFACE_SLANT_INDEX] = FONT_SLANT_FOR_FACE (spec);
;
attrs[LFACE_SLANT_INDEX] = FONT_SLANT_FOR_FACE (spec);
if (! NILP (AREF (spec, FONT_WIDTH_INDEX)))
attrs[LFACE_SWIDTH_INDEX] = FONT_WIDTH_FOR_FACE (spec);
if (! NILP (AREF (spec, FONT_SIZE_INDEX)))
...
...
src/fontset.c
View file @
8510724d
...
...
@@ -1062,7 +1062,7 @@ fontset_pattern_regexp (pattern)
nstars
++
;
else
if
(
*
p0
==
'['
||
*
p0
==
'.'
||
*
p0
==
'\\'
|| *p0 == '+' || *p0 == '^'
||
*
p0
==
'+'
||
*
p0
==
'^'
||
*
p0
==
'$'
)
nescs
++
;
}
...
...
@@ -1090,7 +1090,7 @@ fontset_pattern_regexp (pattern)
*
p1
++
=
'.'
;
else
if
(
*
p0
==
'['
||
*
p0
==
'.'
||
*
p0
==
'\\'
|| *p0 == '+' || *p0 == '^'
||
*
p0
==
'+'
||
*
p0
==
'^'
||
*
p0
==
'$'
)
*
p1
++
=
'\\'
,
*
p1
++
=
*
p0
;
else
...
...
@@ -1619,7 +1619,7 @@ FONT-SPEC is a vector, a cons, or a string. See the documentation of
}
else
{
fontset = FONTSET_FROM_ID (id);
;
fontset
=
FONTSET_FROM_ID
(
id
);
free_realized_fontsets
(
fontset
);
Fset_char_table_range
(
fontset
,
Qt
,
Qnil
);
}
...
...
src/ftfont.c
View file @
8510724d
...
...
@@ -1390,7 +1390,7 @@ ftfont_otf_features (gsub_gpos)
sym
=
Qnil
;
langsyses
=
Fcons
(
Fcons
(
sym
,
features
),
langsyses
);
}
OTF_TAG_SYM
(
sym
,
gsub_gpos
->
ScriptList
.
Script
[
i
].
ScriptTag
);
scripts
=
Fcons
(
Fcons
(
sym
,
langsyses
),
scripts
);
}
...
...
@@ -1778,7 +1778,7 @@ ftfont_drive_otf (font, spec, in, from, to, out, adjustment)
base_x
=
otfg
->
f
.
f4
.
base_anchor
->
XCoordinate
*
x_scale
/
0x10000
;
base_y
=
otfg
->
f
.
f4
.
base_anchor
->
YCoordinate
*
y_scale
/
0x10000
;
mark_x
=
otfg
->
f
.
f4
.
mark_anchor
->
XCoordinate
*
x_scale
/
0x10000
;
mark_y
=
otfg
->
f
.
f4
.
mark_anchor
->
YCoordinate
*
y_scale
/
0x10000
;
;
mark_y
=
otfg
->
f
.
f4
.
mark_anchor
->
YCoordinate
*
y_scale
/
0x10000
;
if
(
otfg
->
f
.
f4
.
base_anchor
->
AnchorFormat
!=
1
)
adjust_anchor
(
ft_face
,
otfg
->
f
.
f4
.
base_anchor
,
...
...
src/xfont.c
View file @
8510724d
...
...
@@ -220,7 +220,7 @@ xfont_decode_coding_xlfd (char *xlfd, int len, char *output)
{
char
*
p0
=
xlfd
,
*
p1
=
output
;
int
c
;
while
(
*
p0
)
{
c
=
*
(
unsigned
char
*
)
p0
++
;
...
...
@@ -242,7 +242,7 @@ xfont_encode_coding_xlfd (char *xlfd)
const
unsigned
char
*
p0
=
(
unsigned
char
*
)
xlfd
;
unsigned
char
*
p1
=
(
unsigned
char
*
)
xlfd
;
int
len
=
0
;
while
(
*
p0
)
{
int
c
=
STRING_CHAR_ADVANCE
(
p0
);
...
...
@@ -363,7 +363,7 @@ xfont_list (frame, spec)
int
len
;
/* Large enough to contain the longest XLFD (255 bytes) in UTF-8. */
char
name
[
512
];
extra
=
AREF
(
spec
,
FONT_EXTRA_INDEX
);
if
(
CONSP
(
extra
))
{
...
...
@@ -642,7 +642,7 @@ xfont_open (f, entity, pixel_size)
char
*
p0
,
*
p
;
int
dashes
=
0
;
p0 = p = (char *) XGetAtomName (FRAME_X_DISPLAY (f), (Atom) value);
;
p0
=
p
=
(
char
*
)
XGetAtomName
(
FRAME_X_DISPLAY
(
f
),
(
Atom
)
value
);
/* Count the number of dashes in the "full name".
If it is too few, this isn't really the font's full name,
so don't use it.
...
...
src/xftfont.c
View file @
8510724d
...
...
@@ -159,7 +159,7 @@ xftfont_list (frame, spec)
Lisp_Object spec;
{
Lisp_Object list = ftfont_driver.list (frame, spec), tail;
for (tail = list; CONSP (tail); tail = XCDR (tail))
ASET (XCAR (tail), FONT_TYPE_INDEX, Qxft);
return list;
...
...
@@ -271,7 +271,7 @@ xftfont_open (f, entity, pixel_size)
FcPatternAddString (pat, FC_FILE, (FcChar8 *) SDATA (filename));
FcPatternAddInteger (pat, FC_INDEX, XINT (index));
BLOCK_INPUT;
match = XftFontMatch (display, FRAME_X_SCREEN_NUMBER (f), pat, &result);
...
...
@@ -335,7 +335,7 @@ xftfont_open (f, entity, pixel_size)
font->space_width = extents.xOff;
if (font->space_width <= 0)
/* dirty workaround */
font
->
space_width
=
pixel_size
;
font->space_width = pixel_size;
XftTextExtents8 (display, xftfont, ascii_printable + 1, 94, &extents);
font->average_width = (font->space_width + extents.xOff) / 95;
}
...
...
@@ -451,7 +451,7 @@ xftfont_done_face (f, face)
struct face *face;
{
struct xftface_info *xftface_info;
#if 0
/* This doesn't work if face->ascii_face doesn't use an Xft font. */
if (face != face->ascii_face
...
...
@@ -490,7 +490,7 @@ xftfont_encode_char (font, c)
struct xftfont_info *xftfont_info = (struct xftfont_info *) font;
unsigned code = XftCharIndex (xftfont_info->display, xftfont_info->xftfont,
(FcChar32) c);
return (code ? code : FONT_INVALID_CODE);
}
...
...
@@ -523,7 +523,7 @@ static XftDraw *
xftfont_get_xft_draw (f)
FRAME_PTR f;
{
XftDraw
*
xft_draw
=
font_get_frame_data
(
f
,
&
xftfont_driver
);
;
XftDraw *xft_draw = font_get_frame_data (f, &xftfont_driver);
if (! xft_draw)
{
...
...
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