]> git.eshelyaron.com Git - emacs.git/commit
(merge_face_vectors): Don't do :ignore-defface overwriting here.
authorChong Yidong <cyd@stupidchicken.com>
Sun, 20 Nov 2005 22:35:48 +0000 (22:35 +0000)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 20 Nov 2005 22:35:48 +0000 (22:35 +0000)
commit67d23e016655c1e79e1f9ba43c22d4fb67a8057e
tree8ae7d9ee14934310e8d842ac36320027aecbd002
parent8c2fb42f85ae6992dc046c4772b0e3f6bd9321ea
(merge_face_vectors): Don't do :ignore-defface overwriting here.
(Finternal_merge_in_global_face): Do it here.
src/ChangeLog
src/xfaces.c