aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 64cd4a09015..7a81bfc51f2 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -2389,9 +2389,7 @@ set_lface_from_font (f, lface, font_object, force_p)
2389 merged height. If FROM is an invalid height, then INVALID is 2389 merged height. If FROM is an invalid height, then INVALID is
2390 returned instead. FROM and TO may be either absolute face heights or 2390 returned instead. FROM and TO may be either absolute face heights or
2391 `relative' heights; the returned value is always an absolute height 2391 `relative' heights; the returned value is always an absolute height
2392 unless both FROM and TO are relative. GCPRO is a lisp value that 2392 unless both FROM and TO are relative. */
2393 will be protected from garbage-collection if this function makes a
2394 call into lisp. */
2395 2393
2396Lisp_Object 2394Lisp_Object
2397merge_face_heights (from, to, invalid) 2395merge_face_heights (from, to, invalid)