diff options
| author | Gerd Moellmann | 2001-10-18 09:50:37 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-10-18 09:50:37 +0000 |
| commit | d8055bfc8f4883f2bfc217b448cba1461252db27 (patch) | |
| tree | ee154ab6006950ee70374ac428af9fc00accef0d | |
| parent | e6b70fd82e47b5de004696671f2d0fd511eec2b9 (diff) | |
| download | emacs-d8055bfc8f4883f2bfc217b448cba1461252db27.tar.gz emacs-d8055bfc8f4883f2bfc217b448cba1461252db27.zip | |
(Finternal_set_lisp_face_attribute): Follow coding conventions.
| -rw-r--r-- | src/xfaces.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 9971541cd31..acb5820db83 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -3831,13 +3831,16 @@ FRAME 0 means change the face on all frames, and change the default | |||
| 3831 | { | 3831 | { |
| 3832 | if (!UNSPECIFIEDP (value)) | 3832 | if (!UNSPECIFIEDP (value)) |
| 3833 | { | 3833 | { |
| 3834 | Lisp_Object test = | 3834 | Lisp_Object test; |
| 3835 | (EQ (face, Qdefault) ? value : | ||
| 3836 | /* The default face must have an absolute size, otherwise, we do | ||
| 3837 | a test merge with a random height to see if VALUE's ok. */ | ||
| 3838 | merge_face_heights (value, make_number(10), Qnil, Qnil)); | ||
| 3839 | 3835 | ||
| 3840 | if (!INTEGERP(test) || XINT(test) <= 0) | 3836 | test = (EQ (face, Qdefault) |
| 3837 | ? value | ||
| 3838 | /* The default face must have an absolute size, | ||
| 3839 | otherwise, we do a test merge with a random | ||
| 3840 | height to see if VALUE's ok. */ | ||
| 3841 | : merge_face_heights (value, make_number (10), Qnil, Qnil)); | ||
| 3842 | |||
| 3843 | if (!INTEGERP (test) || XINT (test) <= 0) | ||
| 3841 | signal_error ("Invalid face height", value); | 3844 | signal_error ("Invalid face height", value); |
| 3842 | } | 3845 | } |
| 3843 | 3846 | ||