diff options
| author | Dave Love | 2003-09-29 18:15:16 +0000 |
|---|---|---|
| committer | Dave Love | 2003-09-29 18:15:16 +0000 |
| commit | 3062711f99266b7cf966d5cd7da7f5a657152c47 (patch) | |
| tree | dea97accde97fc05aacca645477d3bd70c006846 /src | |
| parent | cbb6a48ad01bf41f8435e581fc7d320973414749 (diff) | |
| download | emacs-3062711f99266b7cf966d5cd7da7f5a657152c47.tar.gz emacs-3062711f99266b7cf966d5cd7da7f5a657152c47.zip | |
(face_numeric_value): Declare dim size_t.
(Finternal_lisp_face_equal_p): Remove unused f.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfaces.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 91214977d8e..067e6fd445e 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -1376,7 +1376,7 @@ tty_defined_color (f, color_name, color_def, alloc) | |||
| 1376 | color_def->green = 0; | 1376 | color_def->green = 0; |
| 1377 | 1377 | ||
| 1378 | if (*color_name) | 1378 | if (*color_name) |
| 1379 | status = tty_lookup_color (f, build_string (color_name), color_def, 0); | 1379 | status = tty_lookup_color (f, build_string (color_name), color_def, NULL); |
| 1380 | 1380 | ||
| 1381 | if (color_def->pixel == FACE_TTY_DEFAULT_COLOR && *color_name) | 1381 | if (color_def->pixel == FACE_TTY_DEFAULT_COLOR && *color_name) |
| 1382 | { | 1382 | { |
| @@ -2108,7 +2108,7 @@ face_value (table, dim, symbol) | |||
| 2108 | static INLINE int | 2108 | static INLINE int |
| 2109 | face_numeric_value (table, dim, symbol) | 2109 | face_numeric_value (table, dim, symbol) |
| 2110 | struct table_entry *table; | 2110 | struct table_entry *table; |
| 2111 | int dim; | 2111 | size_t dim; |
| 2112 | Lisp_Object symbol; | 2112 | Lisp_Object symbol; |
| 2113 | { | 2113 | { |
| 2114 | struct table_entry *p = face_value (table, dim, symbol); | 2114 | struct table_entry *p = face_value (table, dim, symbol); |
| @@ -4953,18 +4953,8 @@ If FRAME is omitted or nil, use the selected frame. */) | |||
| 4953 | Lisp_Object face1, face2, frame; | 4953 | Lisp_Object face1, face2, frame; |
| 4954 | { | 4954 | { |
| 4955 | int equal_p; | 4955 | int equal_p; |
| 4956 | struct frame *f; | ||
| 4957 | Lisp_Object lface1, lface2; | 4956 | Lisp_Object lface1, lface2; |
| 4958 | 4957 | ||
| 4959 | if (EQ (frame, Qt)) | ||
| 4960 | f = NULL; | ||
| 4961 | else | ||
| 4962 | /* Don't use check_x_frame here because this function is called | ||
| 4963 | before X frames exist. At that time, if FRAME is nil, | ||
| 4964 | selected_frame will be used which is the frame dumped with | ||
| 4965 | Emacs. That frame is not an X frame. */ | ||
| 4966 | f = frame_or_selected_frame (frame, 2); | ||
| 4967 | |||
| 4968 | lface1 = lface_from_face_name (NULL, face1, 1); | 4958 | lface1 = lface_from_face_name (NULL, face1, 1); |
| 4969 | lface2 = lface_from_face_name (NULL, face2, 1); | 4959 | lface2 = lface_from_face_name (NULL, face2, 1); |
| 4970 | equal_p = lface_equal_p (XVECTOR (lface1)->contents, | 4960 | equal_p = lface_equal_p (XVECTOR (lface1)->contents, |