diff options
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/fontset.c b/src/fontset.c index 005d0a98d2a..d27fa22015e 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -266,19 +266,19 @@ font_def_new (Lisp_Object font_spec, Lisp_Object encoding, | |||
| 266 | 266 | ||
| 267 | #define RFONT_DEF_FACE(rfont_def) AREF (rfont_def, 0) | 267 | #define RFONT_DEF_FACE(rfont_def) AREF (rfont_def, 0) |
| 268 | #define RFONT_DEF_SET_FACE(rfont_def, face_id) \ | 268 | #define RFONT_DEF_SET_FACE(rfont_def, face_id) \ |
| 269 | ASET ((rfont_def), 0, make_fixnum (face_id)) | 269 | ASET (rfont_def, 0, make_fixnum (face_id)) |
| 270 | #define RFONT_DEF_FONT_DEF(rfont_def) AREF (rfont_def, 1) | 270 | #define RFONT_DEF_FONT_DEF(rfont_def) AREF (rfont_def, 1) |
| 271 | #define RFONT_DEF_SPEC(rfont_def) FONT_DEF_SPEC (AREF (rfont_def, 1)) | 271 | #define RFONT_DEF_SPEC(rfont_def) FONT_DEF_SPEC (AREF (rfont_def, 1)) |
| 272 | #define RFONT_DEF_OBJECT(rfont_def) AREF (rfont_def, 2) | 272 | #define RFONT_DEF_OBJECT(rfont_def) AREF (rfont_def, 2) |
| 273 | #define RFONT_DEF_SET_OBJECT(rfont_def, object) \ | 273 | #define RFONT_DEF_SET_OBJECT(rfont_def, object) \ |
| 274 | ASET ((rfont_def), 2, (object)) | 274 | ASET (rfont_def, 2, object) |
| 275 | /* Score of RFONT_DEF is an integer value; the lowest 8 bits represent | 275 | /* Score of RFONT_DEF is an integer value; the lowest 8 bits represent |
| 276 | the order of listing by font backends, the higher bits represents | 276 | the order of listing by font backends, the higher bits represents |
| 277 | the order given by charset priority list. The smaller value is | 277 | the order given by charset priority list. The smaller value is |
| 278 | preferable. */ | 278 | preferable. */ |
| 279 | #define RFONT_DEF_SCORE(rfont_def) XFIXNUM (AREF (rfont_def, 3)) | 279 | #define RFONT_DEF_SCORE(rfont_def) XFIXNUM (AREF (rfont_def, 3)) |
| 280 | #define RFONT_DEF_SET_SCORE(rfont_def, score) \ | 280 | #define RFONT_DEF_SET_SCORE(rfont_def, score) \ |
| 281 | ASET ((rfont_def), 3, make_fixnum (score)) | 281 | ASET (rfont_def, 3, make_fixnum (score)) |
| 282 | #define RFONT_DEF_NEW(rfont_def, font_def) \ | 282 | #define RFONT_DEF_NEW(rfont_def, font_def) \ |
| 283 | do { \ | 283 | do { \ |
| 284 | (rfont_def) = make_nil_vector (4); \ | 284 | (rfont_def) = make_nil_vector (4); \ |
| @@ -295,7 +295,7 @@ font_def_new (Lisp_Object font_spec, Lisp_Object encoding, | |||
| 295 | #define FONTSET_REF(fontset, c) \ | 295 | #define FONTSET_REF(fontset, c) \ |
| 296 | (EQ (fontset, Vdefault_fontset) \ | 296 | (EQ (fontset, Vdefault_fontset) \ |
| 297 | ? CHAR_TABLE_REF (fontset, c) \ | 297 | ? CHAR_TABLE_REF (fontset, c) \ |
| 298 | : fontset_ref ((fontset), (c))) | 298 | : fontset_ref (fontset, c)) |
| 299 | 299 | ||
| 300 | static Lisp_Object | 300 | static Lisp_Object |
| 301 | fontset_ref (Lisp_Object fontset, int c) | 301 | fontset_ref (Lisp_Object fontset, int c) |
| @@ -315,7 +315,7 @@ fontset_ref (Lisp_Object fontset, int c) | |||
| 315 | specifying a range. */ | 315 | specifying a range. */ |
| 316 | 316 | ||
| 317 | #define FONTSET_SET(fontset, range, elt) \ | 317 | #define FONTSET_SET(fontset, range, elt) \ |
| 318 | Fset_char_table_range ((fontset), (range), (elt)) | 318 | Fset_char_table_range (fontset, range, elt) |
| 319 | 319 | ||
| 320 | 320 | ||
| 321 | /* Modify the elements of FONTSET for characters in RANGE by replacing | 321 | /* Modify the elements of FONTSET for characters in RANGE by replacing |
| @@ -329,7 +329,7 @@ fontset_ref (Lisp_Object fontset, int c) | |||
| 329 | ? (NILP (range) \ | 329 | ? (NILP (range) \ |
| 330 | ? set_fontset_fallback (fontset, make_vector (1, elt)) \ | 330 | ? set_fontset_fallback (fontset, make_vector (1, elt)) \ |
| 331 | : (void) Fset_char_table_range (fontset, range, make_vector (1, elt))) \ | 331 | : (void) Fset_char_table_range (fontset, range, make_vector (1, elt))) \ |
| 332 | : fontset_add ((fontset), (range), (elt), (add))) | 332 | : fontset_add (fontset, range, elt, add)) |
| 333 | 333 | ||
| 334 | static void | 334 | static void |
| 335 | fontset_add (Lisp_Object fontset, Lisp_Object range, Lisp_Object elt, Lisp_Object add) | 335 | fontset_add (Lisp_Object fontset, Lisp_Object range, Lisp_Object elt, Lisp_Object add) |