aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-02-08 16:24:46 +0000
committerStefan Monnier2008-02-08 16:24:46 +0000
commitdfae5f9a1256e8d9243dc0d0550cb58a4c079cdc (patch)
tree1067e8526236f4afab0fa4b8d48b9035d70190cf
parent9141ca5e7dd56c6ac375fd41238dfd6e9683917b (diff)
downloademacs-dfae5f9a1256e8d9243dc0d0550cb58a4c079cdc.tar.gz
emacs-dfae5f9a1256e8d9243dc0d0550cb58a4c079cdc.zip
* xfaces.c (Finternal_make_lisp_face): Use ASET.
-rw-r--r--src/ChangeLog1
-rw-r--r--src/xfaces.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 516e1b46961..ae92bc3589d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * keymap.c (Fkey_description): Move side effect outside of macro call. 3 * keymap.c (Fkey_description): Move side effect outside of macro call.
4 4
5 * xfaces.c (Finternal_make_lisp_face):
5 * keyboard.c (add_command_key, parse_menu_item): Use ASET. 6 * keyboard.c (add_command_key, parse_menu_item): Use ASET.
6 7
7 * fontset.c (free_face_fontset): Use FONTSET_FROM_ID. 8 * fontset.c (free_face_fontset): Use FONTSET_FROM_ID.
diff --git a/src/xfaces.c b/src/xfaces.c
index c00dade631b..f980f2d2d1f 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4101,7 +4101,7 @@ Value is a vector of face attributes. */)
4101 { 4101 {
4102 global_lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), 4102 global_lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE),
4103 Qunspecified); 4103 Qunspecified);
4104 AREF (global_lface, 0) = Qface; 4104 ASET (global_lface, 0, Qface);
4105 Vface_new_frame_defaults = Fcons (Fcons (face, global_lface), 4105 Vface_new_frame_defaults = Fcons (Fcons (face, global_lface),
4106 Vface_new_frame_defaults); 4106 Vface_new_frame_defaults);
4107 4107
@@ -4123,7 +4123,7 @@ Value is a vector of face attributes. */)
4123 } 4123 }
4124 else if (f == NULL) 4124 else if (f == NULL)
4125 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) 4125 for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
4126 AREF (global_lface, i) = Qunspecified; 4126 ASET (global_lface, i, Qunspecified);
4127 4127
4128 /* Add a frame-local definition. */ 4128 /* Add a frame-local definition. */
4129 if (f) 4129 if (f)
@@ -4132,12 +4132,12 @@ Value is a vector of face attributes. */)
4132 { 4132 {
4133 lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), 4133 lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE),
4134 Qunspecified); 4134 Qunspecified);
4135 AREF (lface, 0) = Qface; 4135 ASET (lface, 0, Qface);
4136 f->face_alist = Fcons (Fcons (face, lface), f->face_alist); 4136 f->face_alist = Fcons (Fcons (face, lface), f->face_alist);
4137 } 4137 }
4138 else 4138 else
4139 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) 4139 for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
4140 AREF (lface, i) = Qunspecified; 4140 ASET (lface, i, Qunspecified);
4141 } 4141 }
4142 else 4142 else
4143 lface = global_lface; 4143 lface = global_lface;