diff options
| author | Richard M. Stallman | 2004-08-16 22:53:28 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2004-08-16 22:53:28 +0000 |
| commit | d9639b25df7ed0391cd652ba7fb771a049d93822 (patch) | |
| tree | 16eca87f4e7bfcca9a370d8a0dfb0180deb6b45e /src | |
| parent | 97d8f112efe9d0b1d5e6f56a6f6eaaec1900df9f (diff) | |
| download | emacs-d9639b25df7ed0391cd652ba7fb771a049d93822.tar.gz emacs-d9639b25df7ed0391cd652ba7fb771a049d93822.zip | |
(merge_face_ref): Specifying `unspecified' is a no-op.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfaces.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index f78ecacee1a..aafd762b73b 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -3626,7 +3626,10 @@ merge_face_ref (f, face_ref, to, err_msgs, named_merge_points) | |||
| 3626 | Lisp_Object value = XCAR (XCDR (face_ref)); | 3626 | Lisp_Object value = XCAR (XCDR (face_ref)); |
| 3627 | int err = 0; | 3627 | int err = 0; |
| 3628 | 3628 | ||
| 3629 | if (EQ (keyword, QCfamily)) | 3629 | /* Specifying `unspecified' is a no-op. */ |
| 3630 | if (EQ (value, Qunspecified)) | ||
| 3631 | ; | ||
| 3632 | else if (EQ (keyword, QCfamily)) | ||
| 3630 | { | 3633 | { |
| 3631 | if (STRINGP (value)) | 3634 | if (STRINGP (value)) |
| 3632 | to[LFACE_FAMILY_INDEX] = value; | 3635 | to[LFACE_FAMILY_INDEX] = value; |