1 files changed, 55 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ac7d5fb07f3..e2a5fa1fd9c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,58 @@
+2005-04-19  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (setup_for_ellipsis): Reset saved_face_id to use default
+        face unless last visible char and first invisible char have the
+        same face.  Also use default face if saved_face_id is undefined.
+
+2005-04-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macgui.h (MacFontStruct): Remove member `fontname'.  Add member
+        `full_name'.
+        [TARGET_API_MAC_CARBON] (MacFontStruct): Use type int for
+        mac_scriptcode member.
+
+        * macterm.c (Qbig5, Qcn_gb, Qsjis, Qeuc_kr): Remove variables.
+        (syms_of_mac): Don't initialize them.
+        (Vmac_charset_info_alist): New variable.
+        (syms_of_mac): Defvar it.
+        (create_text_encoding_info_alist): New function.
+        (decode_mac_font_name, mac_to_x_fontname)
+        (x_font_name_to_mac_font_name, init_font_name_table): Don't hard
+        code the correspondence among XLFD charsets, Mac script codes, and
+        Emacs coding systems.  Use Vmac_charset_info_alist and result of
+        create_text_encoding_info_alist instead.
+        (init_font_name_table) [TARGET_API_MAC_CARBON]: Use Font Manager
+        routines also on Mac OS Classic.
+        (init_font_name_table) [!TARGET_API_MAC_CARBON]: Use
+        add_font_name_table_entry.
+        (mac_do_list_fonts): Regard 0 in XLFD scaleble fields as
+        specified.  Derive unspecified scalable fields from specified one.
+        (x_list_fonts): Consider Valternate_fontname_alist.
+        (kDefaultFontSize): Change value from 9 to 12.
+        (XLoadQueryFont): Get decoded font family, font face, and charset
+        from x_font_name_to_mac_font_name.  Set full name of loaded font.
+        (mac_unload_font): Free `full_name' member.
+        (x_load_font): Don't try XLoadQueryFont if x_list_fonts returns
+        NULL.  Copy full_name member of struct MacFontStruct to that of
+        struct font_info.
+
+2005-04-19  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (handle_stop): Set saved_face_id to current face if
+        selective_display_ellipsis_p so ellipsis will be shown in same
+        face as preceding text.
+        (setup_for_ellipsis): Don't set saved_face_id here.
+        (next_element_from_display_vector): Default to saved_face_id.
+
+        * fns.c (Fsafe_get): New function.
+        (syms_of_fns): Defsubr it.
+
+        * lisp.h (Fsafe_get): EXFUN it.
+
+        * xfaces.c (resolve_face_name): Use Fsafe_get to avoid redisplay
+        loops in case of bad face property lists.  Limit number of face
+        alias lookups to 10 (in case of face alias loops).
+
 2005-04-18  Kim F. Storm  <storm@cua.dk>
 
         * dispextern.h (struct glyph_row): New member overlay_arrow_bitmap.