procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(merge_face_vectors): Use braces to follow GNU Coding Standards.

Browse source 
(Finternal_set_lisp_face_attribute): Likewise.
This commit is contained in:
Pavel Janík 2001-11-09 06:47:21 +00:00
parent 40ef1eda44
commit ab8469eb87
2 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,5 +1,9 @@
2001-11-09 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
* xfaces.c (merge_face_vectors): Use braces to follow GNU
Coding Standards.
(Finternal_set_lisp_face_attribute): Likewise.
* indent.c (current_column_1): Remove unused variable `prev_col'.
2001-11-07 Jason Rumney <jasonr@gnu.org>

40
src/xfaces.c
View file

@ -3310,10 +3310,12 @@ merge_face_vectors (f, from, to, cycle_check)
for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
if (!UNSPECIFIEDP (from[i]))
if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
to[i] = merge_face_heights (from[i], to[i], to[i], cycle_check);
else
to[i] = from[i];
{
if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
to[i] = merge_face_heights (from[i], to[i], to[i], cycle_check);
else
to[i] = from[i];
}
/* TO is always an absolute face, which should inherit from nothing.
We blindly copy the :inherit attribute above and fix it up here. */
@ -4185,20 +4187,22 @@ FRAME 0 means change the face on all frames, and change the default
}
if (!NILP (param))
if (EQ (frame, Qt))
/* Update `default-frame-alist', which is used for new frames. */
{
store_in_alist (&Vdefault_frame_alist, param, value);
}
else
/* Update the current frame's parameters. */
{
Lisp_Object cons;
cons = XCAR (Vparam_value_alist);
XSETCAR (cons, param);
XSETCDR (cons, value);
Fmodify_frame_parameters (frame, Vparam_value_alist);
}
{
if (EQ (frame, Qt))
/* Update `default-frame-alist', which is used for new frames. */
{
store_in_alist (&Vdefault_frame_alist, param, value);
}
else
/* Update the current frame's parameters. */
{
Lisp_Object cons;
cons = XCAR (Vparam_value_alist);
XSETCAR (cons, param);
XSETCDR (cons, value);
Fmodify_frame_parameters (frame, Vparam_value_alist);
}
}
}
return face;