(merge_faces): Rename from merge_into_realized_face.
authorKim F. Storm <storm@cua.dk>
Mon, 10 Jan 2005 13:35:11 +0000 (13:35 +0000)
committerKim F. Storm <storm@cua.dk>
Mon, 10 Jan 2005 13:35:11 +0000 (13:35 +0000)
commitdc91a0ed800ec66f7bdcdd67e59b8565fd52be45
treee57553e725002fad441be7931d326d204a395539
parent539f1217675895e849df3cee5c95a9ea4e36071e
(merge_faces): Rename from merge_into_realized_face.
Callers changed.
Add support to merge with lisp face id too (if face_name is t).
src/xfaces.c