Commit 969065c3 authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(next_element_from_display_vector): Improve comments.

parent 7363a903
2000-07-25 Gerd Moellmann <gerd@gnu.org> 2000-07-25 Gerd Moellmann <gerd@gnu.org>
   
* xdisp.c (next_element_from_display_vector): Improve comments.
* lisp.h (GLYPH_MASK_CHAR, GLYPH_MASK_FACE): Use 19 bits
for the character code, and the rest for the face id as in 20.x.
(FAST_GLYPH_FACE, FAST_MAKE_GLYPH): Changed accordingly.
* window.c (window_display_table): Cleaned up.
* syntax.c (Fforward_word): Add last arg nil in call of * syntax.c (Fforward_word): Add last arg nil in call of
Fconstrain_to_field. Fconstrain_to_field.
   
2000-07-25 Eli Zaretskii <eliz@is.elta.co.il> 2000-07-25 Eli Zaretskii <eliz@is.elta.co.il>
   
* fileio.c (Frename-file) [DOS_NT]: If the file names are * fileio.c (Frename_file) [DOS_NT]: If the file names are
identical but for the letter-case, don't call identical but for the letter-case, don't call
barf_or_query_if_file_exists. barf_or_query_if_file_exists.
   
......
...@@ -3816,15 +3816,14 @@ next_element_from_display_vector (it) ...@@ -3816,15 +3816,14 @@ next_element_from_display_vector (it)
/* The entry may contain a face id to use. Such a face id is /* The entry may contain a face id to use. Such a face id is
the id of a Lisp face, not a realized face. A face id of the id of a Lisp face, not a realized face. A face id of
zero means no face. */ zero means no face is specified. */
lface_id = FAST_GLYPH_FACE (g); lface_id = FAST_GLYPH_FACE (g);
if (lface_id) if (lface_id)
{ {
/* The function returns -1 if lface_id is invalid. */
int face_id = ascii_face_of_lisp_face (it->f, lface_id); int face_id = ascii_face_of_lisp_face (it->f, lface_id);
if (face_id >= 0) if (face_id >= 0)
{ it->face_id = face_id;
it->face_id = face_id;
}
} }
} }
else else
......
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