aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2000-08-05 15:47:13 +0000
committerGerd Moellmann2000-08-05 15:47:13 +0000
commit1a948b17948fffafe6022c0152dba0dc5cc84cef (patch)
tree885aa11f387d059bb56d71466fc7a4813cc71bec /src
parentefb29aff040b24eb29565b373030ad3e522f7442 (diff)
downloademacs-1a948b17948fffafe6022c0152dba0dc5cc84cef.tar.gz
emacs-1a948b17948fffafe6022c0152dba0dc5cc84cef.zip
Replace `illegal' with `invalid'.
Diffstat (limited to 'src')
-rw-r--r--src/w32fns.c4
-rw-r--r--src/xfaces.c26
-rw-r--r--src/xfns.c4
3 files changed, 17 insertions, 17 deletions
diff --git a/src/w32fns.c b/src/w32fns.c
index e81fcb794e3..7e44f78efda 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1939,7 +1939,7 @@ x_set_line_spacing (f, new_value, old_value)
1939 else if (NATNUMP (new_value)) 1939 else if (NATNUMP (new_value))
1940 f->extra_line_spacing = XFASTINT (new_value); 1940 f->extra_line_spacing = XFASTINT (new_value);
1941 else 1941 else
1942 Fsignal (Qerror, Fcons (build_string ("Illegal line-spacing"), 1942 Fsignal (Qerror, Fcons (build_string ("Invalid line-spacing"),
1943 Fcons (new_value, Qnil))); 1943 Fcons (new_value, Qnil)));
1944 if (FRAME_VISIBLE_P (f)) 1944 if (FRAME_VISIBLE_P (f))
1945 redraw_frame (f); 1945 redraw_frame (f);
@@ -1960,7 +1960,7 @@ x_set_screen_gamma (f, new_value, old_value)
1960 /* The value 0.4545 is the normal viewing gamma. */ 1960 /* The value 0.4545 is the normal viewing gamma. */
1961 f->gamma = 1.0 / (0.4545 * XFLOATINT (new_value)); 1961 f->gamma = 1.0 / (0.4545 * XFLOATINT (new_value));
1962 else 1962 else
1963 Fsignal (Qerror, Fcons (build_string ("Illegal screen-gamma"), 1963 Fsignal (Qerror, Fcons (build_string ("Invalid screen-gamma"),
1964 Fcons (new_value, Qnil))); 1964 Fcons (new_value, Qnil)));
1965 1965
1966 clear_face_cache (0); 1966 clear_face_cache (0);
diff --git a/src/xfaces.c b/src/xfaces.c
index 2e9cb8da4d0..9383555b434 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3107,14 +3107,14 @@ merge_face_vector_with_property (f, to, prop)
3107 if (STRINGP (value)) 3107 if (STRINGP (value))
3108 to[LFACE_FAMILY_INDEX] = value; 3108 to[LFACE_FAMILY_INDEX] = value;
3109 else 3109 else
3110 add_to_log ("Illegal face font family", value, Qnil); 3110 add_to_log ("Invalid face font family", value, Qnil);
3111 } 3111 }
3112 else if (EQ (keyword, QCheight)) 3112 else if (EQ (keyword, QCheight))
3113 { 3113 {
3114 if (INTEGERP (value)) 3114 if (INTEGERP (value))
3115 to[LFACE_HEIGHT_INDEX] = value; 3115 to[LFACE_HEIGHT_INDEX] = value;
3116 else 3116 else
3117 add_to_log ("Illegal face font height", value, Qnil); 3117 add_to_log ("Invalid face font height", value, Qnil);
3118 } 3118 }
3119 else if (EQ (keyword, QCweight)) 3119 else if (EQ (keyword, QCweight))
3120 { 3120 {
@@ -3122,7 +3122,7 @@ merge_face_vector_with_property (f, to, prop)
3122 && face_numeric_weight (value) >= 0) 3122 && face_numeric_weight (value) >= 0)
3123 to[LFACE_WEIGHT_INDEX] = value; 3123 to[LFACE_WEIGHT_INDEX] = value;
3124 else 3124 else
3125 add_to_log ("Illegal face weight", value, Qnil); 3125 add_to_log ("Invalid face weight", value, Qnil);
3126 } 3126 }
3127 else if (EQ (keyword, QCslant)) 3127 else if (EQ (keyword, QCslant))
3128 { 3128 {
@@ -3130,7 +3130,7 @@ merge_face_vector_with_property (f, to, prop)
3130 && face_numeric_slant (value) >= 0) 3130 && face_numeric_slant (value) >= 0)
3131 to[LFACE_SLANT_INDEX] = value; 3131 to[LFACE_SLANT_INDEX] = value;
3132 else 3132 else
3133 add_to_log ("Illegal face slant", value, Qnil); 3133 add_to_log ("Invalid face slant", value, Qnil);
3134 } 3134 }
3135 else if (EQ (keyword, QCunderline)) 3135 else if (EQ (keyword, QCunderline))
3136 { 3136 {
@@ -3139,7 +3139,7 @@ merge_face_vector_with_property (f, to, prop)
3139 || STRINGP (value)) 3139 || STRINGP (value))
3140 to[LFACE_UNDERLINE_INDEX] = value; 3140 to[LFACE_UNDERLINE_INDEX] = value;
3141 else 3141 else
3142 add_to_log ("Illegal face underline", value, Qnil); 3142 add_to_log ("Invalid face underline", value, Qnil);
3143 } 3143 }
3144 else if (EQ (keyword, QCoverline)) 3144 else if (EQ (keyword, QCoverline))
3145 { 3145 {
@@ -3148,7 +3148,7 @@ merge_face_vector_with_property (f, to, prop)
3148 || STRINGP (value)) 3148 || STRINGP (value))
3149 to[LFACE_OVERLINE_INDEX] = value; 3149 to[LFACE_OVERLINE_INDEX] = value;
3150 else 3150 else
3151 add_to_log ("Illegal face overline", value, Qnil); 3151 add_to_log ("Invalid face overline", value, Qnil);
3152 } 3152 }
3153 else if (EQ (keyword, QCstrike_through)) 3153 else if (EQ (keyword, QCstrike_through))
3154 { 3154 {
@@ -3157,7 +3157,7 @@ merge_face_vector_with_property (f, to, prop)
3157 || STRINGP (value)) 3157 || STRINGP (value))
3158 to[LFACE_STRIKE_THROUGH_INDEX] = value; 3158 to[LFACE_STRIKE_THROUGH_INDEX] = value;
3159 else 3159 else
3160 add_to_log ("Illegal face strike-through", value, Qnil); 3160 add_to_log ("Invalid face strike-through", value, Qnil);
3161 } 3161 }
3162 else if (EQ (keyword, QCbox)) 3162 else if (EQ (keyword, QCbox))
3163 { 3163 {
@@ -3169,7 +3169,7 @@ merge_face_vector_with_property (f, to, prop)
3169 || NILP (value)) 3169 || NILP (value))
3170 to[LFACE_BOX_INDEX] = value; 3170 to[LFACE_BOX_INDEX] = value;
3171 else 3171 else
3172 add_to_log ("Illegal face box", value, Qnil); 3172 add_to_log ("Invalid face box", value, Qnil);
3173 } 3173 }
3174 else if (EQ (keyword, QCinverse_video) 3174 else if (EQ (keyword, QCinverse_video)
3175 || EQ (keyword, QCreverse_video)) 3175 || EQ (keyword, QCreverse_video))
@@ -3177,21 +3177,21 @@ merge_face_vector_with_property (f, to, prop)
3177 if (EQ (value, Qt) || NILP (value)) 3177 if (EQ (value, Qt) || NILP (value))
3178 to[LFACE_INVERSE_INDEX] = value; 3178 to[LFACE_INVERSE_INDEX] = value;
3179 else 3179 else
3180 add_to_log ("Illegal face inverse-video", value, Qnil); 3180 add_to_log ("Invalid face inverse-video", value, Qnil);
3181 } 3181 }
3182 else if (EQ (keyword, QCforeground)) 3182 else if (EQ (keyword, QCforeground))
3183 { 3183 {
3184 if (STRINGP (value)) 3184 if (STRINGP (value))
3185 to[LFACE_FOREGROUND_INDEX] = value; 3185 to[LFACE_FOREGROUND_INDEX] = value;
3186 else 3186 else
3187 add_to_log ("Illegal face foreground", value, Qnil); 3187 add_to_log ("Invalid face foreground", value, Qnil);
3188 } 3188 }
3189 else if (EQ (keyword, QCbackground)) 3189 else if (EQ (keyword, QCbackground))
3190 { 3190 {
3191 if (STRINGP (value)) 3191 if (STRINGP (value))
3192 to[LFACE_BACKGROUND_INDEX] = value; 3192 to[LFACE_BACKGROUND_INDEX] = value;
3193 else 3193 else
3194 add_to_log ("Illegal face background", value, Qnil); 3194 add_to_log ("Invalid face background", value, Qnil);
3195 } 3195 }
3196 else if (EQ (keyword, QCstipple)) 3196 else if (EQ (keyword, QCstipple))
3197 { 3197 {
@@ -3200,7 +3200,7 @@ merge_face_vector_with_property (f, to, prop)
3200 if (!NILP (pixmap_p)) 3200 if (!NILP (pixmap_p))
3201 to[LFACE_STIPPLE_INDEX] = value; 3201 to[LFACE_STIPPLE_INDEX] = value;
3202 else 3202 else
3203 add_to_log ("Illegal face stipple", value, Qnil); 3203 add_to_log ("Invalid face stipple", value, Qnil);
3204#endif 3204#endif
3205 } 3205 }
3206 else if (EQ (keyword, QCwidth)) 3206 else if (EQ (keyword, QCwidth))
@@ -3209,7 +3209,7 @@ merge_face_vector_with_property (f, to, prop)
3209 && face_numeric_swidth (value) >= 0) 3209 && face_numeric_swidth (value) >= 0)
3210 to[LFACE_SWIDTH_INDEX] = value; 3210 to[LFACE_SWIDTH_INDEX] = value;
3211 else 3211 else
3212 add_to_log ("Illegal face width", value, Qnil); 3212 add_to_log ("Invalid face width", value, Qnil);
3213 } 3213 }
3214 else 3214 else
3215 add_to_log ("Invalid attribute %s in face property", 3215 add_to_log ("Invalid attribute %s in face property",
diff --git a/src/xfns.c b/src/xfns.c
index 740a7c15c6e..ea7f3a06252 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1307,7 +1307,7 @@ x_set_line_spacing (f, new_value, old_value)
1307 else if (NATNUMP (new_value)) 1307 else if (NATNUMP (new_value))
1308 f->extra_line_spacing = XFASTINT (new_value); 1308 f->extra_line_spacing = XFASTINT (new_value);
1309 else 1309 else
1310 Fsignal (Qerror, Fcons (build_string ("Illegal line-spacing"), 1310 Fsignal (Qerror, Fcons (build_string ("Invalid line-spacing"),
1311 Fcons (new_value, Qnil))); 1311 Fcons (new_value, Qnil)));
1312 if (FRAME_VISIBLE_P (f)) 1312 if (FRAME_VISIBLE_P (f))
1313 redraw_frame (f); 1313 redraw_frame (f);
@@ -1328,7 +1328,7 @@ x_set_screen_gamma (f, new_value, old_value)
1328 /* The value 0.4545 is the normal viewing gamma. */ 1328 /* The value 0.4545 is the normal viewing gamma. */
1329 f->gamma = 1.0 / (0.4545 * XFLOATINT (new_value)); 1329 f->gamma = 1.0 / (0.4545 * XFLOATINT (new_value));
1330 else 1330 else
1331 Fsignal (Qerror, Fcons (build_string ("Illegal screen-gamma"), 1331 Fsignal (Qerror, Fcons (build_string ("Invalid screen-gamma"),
1332 Fcons (new_value, Qnil))); 1332 Fcons (new_value, Qnil)));
1333 1333
1334 clear_face_cache (0); 1334 clear_face_cache (0);