Mercurial > emacs
comparison mac/inc/sys/file.h @ 67056:3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
(Finternal_merge_in_global_face): Do it here.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sun, 20 Nov 2005 22:35:48 +0000 |
parents | 3723093a21fd |
children | 067115a6e738 2d92f5c9d6ae |
comparison
equal
deleted
inserted
replaced
67055:c6ae377fa1f0 | 67056:3ce17ff4a61f |
---|