Commit a9a06e0b authored by Paul Eggert's avatar Paul Eggert
Browse files

* fontset.c (FONTSET_SPEC, FONTSET_REPERTORY, RFONT_DEF_REPERTORY): Remove; unused.

parent cc6e5db1
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* fontset.c (free_realized_fontset): Now static. * fontset.c (free_realized_fontset): Now static.
(Fset_fontset_font): Rename local to avoid shadowing. (Fset_fontset_font): Rename local to avoid shadowing.
(fontset_font): Mark local as initialized. (fontset_font): Mark local as initialized.
(FONTSET_SPEC, FONTSET_REPERTORY, RFONT_DEF_REPERTORY): Remove; unused.
   
* xrdb.c: Include "xterm.h", to check x_load_resources's interface. * xrdb.c: Include "xterm.h", to check x_load_resources's interface.
   
...@@ -233,14 +233,14 @@ fontset_id_valid_p (int id) ...@@ -233,14 +233,14 @@ fontset_id_valid_p (int id)
/* Macros to access special values of (base) FONTSET. */ /* Macros to access special values of (base) FONTSET. */
#define FONTSET_NAME(fontset) XCHAR_TABLE (fontset)->extras[1] #define FONTSET_NAME(fontset) XCHAR_TABLE (fontset)->extras[1]
#define FONTSET_ASCII(fontset) XCHAR_TABLE (fontset)->extras[4] #define FONTSET_ASCII(fontset) XCHAR_TABLE (fontset)->extras[4]
#define FONTSET_SPEC(fontset) XCHAR_TABLE (fontset)->extras[5] /* #define FONTSET_SPEC(fontset) XCHAR_TABLE (fontset)->extras[5] */
/* Macros to access special values of (realized) FONTSET. */ /* Macros to access special values of (realized) FONTSET. */
#define FONTSET_BASE(fontset) XCHAR_TABLE (fontset)->extras[2] #define FONTSET_BASE(fontset) XCHAR_TABLE (fontset)->extras[2]
#define FONTSET_FRAME(fontset) XCHAR_TABLE (fontset)->extras[3] #define FONTSET_FRAME(fontset) XCHAR_TABLE (fontset)->extras[3]
#define FONTSET_OBJLIST(fontset) XCHAR_TABLE (fontset)->extras[4] #define FONTSET_OBJLIST(fontset) XCHAR_TABLE (fontset)->extras[4]
#define FONTSET_NOFONT_FACE(fontset) XCHAR_TABLE (fontset)->extras[5] #define FONTSET_NOFONT_FACE(fontset) XCHAR_TABLE (fontset)->extras[5]
#define FONTSET_REPERTORY(fontset) XCHAR_TABLE (fontset)->extras[6] /* #define FONTSET_REPERTORY(fontset) XCHAR_TABLE (fontset)->extras[6] */
#define FONTSET_DEFAULT(fontset) XCHAR_TABLE (fontset)->extras[7] #define FONTSET_DEFAULT(fontset) XCHAR_TABLE (fontset)->extras[7]
/* For both base and realized fontset. */ /* For both base and realized fontset. */
...@@ -266,7 +266,6 @@ fontset_id_valid_p (int id) ...@@ -266,7 +266,6 @@ fontset_id_valid_p (int id)
ASET ((rfont_def), 0, make_number (face_id)) ASET ((rfont_def), 0, make_number (face_id))
#define RFONT_DEF_FONT_DEF(rfont_def) AREF (rfont_def, 1) #define RFONT_DEF_FONT_DEF(rfont_def) AREF (rfont_def, 1)
#define RFONT_DEF_SPEC(rfont_def) FONT_DEF_SPEC (AREF (rfont_def, 1)) #define RFONT_DEF_SPEC(rfont_def) FONT_DEF_SPEC (AREF (rfont_def, 1))
#define RFONT_DEF_REPERTORY(rfont_def) FONT_DEF_REPERTORY (AREF (rfont_def, 1))
#define RFONT_DEF_OBJECT(rfont_def) AREF (rfont_def, 2) #define RFONT_DEF_OBJECT(rfont_def) AREF (rfont_def, 2)
#define RFONT_DEF_SET_OBJECT(rfont_def, object) \ #define RFONT_DEF_SET_OBJECT(rfont_def, object) \
ASET ((rfont_def), 2, (object)) ASET ((rfont_def), 2, (object))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment