Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-376
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
   (Fdisplay_supports_face_attributes_p): Work around bootstrapping problem

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-378
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-379
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-380
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
   Face merging cleanups


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-190

1 files changed, 71 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d9000d6dd05..0770eaeff69 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,62 @@
+2004-06-07  Miles Bader  <miles@gnu.org>
+
+        * (struct named_merge_point): New type.
+        (push_named_merge_point): New function.
+        (merge_named_face): New function.
+        (merge_face_ref, face_at_buffer_position, face_at_string_position):
+        Use `merge_named_face'.
+        (merge_face_inheritance): Function removed.
+        (merge_face_ref): Renamed from `merge_face_vector_with_property'.
+        Add new `err_msgs' and `named_merge_points' args.  Return error
+        status.  Only print error messages if ERR_MSGS is true.  Don't try to
+        do :inherit attribute validation.
+        (merge_face_heights): Handle `unspecified' in both directions.
+        (merge_face_vectors): Rename `cycle_check' arg to `named_merge_points'.
+        Call `merge_face_ref' instead of `merge_face_inheritance'.
+        (Fdisplay_supports_face_attributes_p, Fface_attributes_as_vector)
+        (compute_char_face, face_at_buffer_position)
+        (face_at_string_position): Call `merge_face_ref' instead of
+        `merge_face_vector_with_property'.
+
+2004-06-07  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (find_safe_codings): Check NILP (safe_codings) only at
+        the necessary places.
+
+2004-06-07  Kim F. Storm  <storm@cua.dk>
+
+        * process.c (Fdelete_process): Undo 2004-05-28 change.
+        Instead, call status_notify also for network process.
+        (status_message): Use process instead of status as arg.
+        Give messages "deleted" or "connection broken by remote peer" for
+        an exited network process.
+        (status_notify): Change call to status_message.
+        (read_process_output): Increase readmax to 4096.  Do not increase
+        buffer size for datagram channels (default is now large enough).
+
+2004-06-06  Steven Tamm  <tamm@Steven-Tamms-Computer.local>
+
+        * macfns.c (x_create_tip_frame): Fix Mac OS X 10.1 compilation
+        problem due to newly defined variable.
+
+2004-06-06  Miles Bader  <miles@gnu.org>
+
+        * xfaces.c (Fdisplay_supports_face_attributes_p): Give up
+        immediately if non-interactive or not initialized.
+
+2004-06-05  Richard M. Stallman  <rms@gnu.org>
+
+        * minibuf.c (Fcompleting_read): Doc fix.
+
+2004-06-05  Andreas Schwab  <schwab@suse.de>
+
+        * macfns.c (x_create_tip_frame): Fix declaration after statement.
+
+2004-06-05  Juanma Barranquero  <lektu@terra.es>
+
+        * keymap.c (Fdescribe_vector): Fix docstring.
+        (Fkey_description, Fglobal_key_binding): Fix typo in docstring.
+
 2004-06-05  Miles Bader  <miles@gnu.org>
 
         * xfaces.c (tty_supports_face_attributes_p): Make sure the specified
@@ -18,7 +77,7 @@
         (Ftty_supports_face_attributes_p): Function deleted.
         (Fdisplay_supports_face_attributes_p): New function.
         (syms_of_xfaces): Initialize Sdisplay_supports_face_attributes_p.
-        (face_attr_equal_p): New function
+        (face_attr_equal_p): New function.
         (lface_equal_p): Use it.
 
 2004-06-03  Juanma Barranquero  <lektu@terra.es>
@@ -3828,7 +3887,7 @@
 
 2003-07-09  Kim F. Storm  <storm@cua.dk>
 
-        * xterm.c (use_xim) [!USE_XIM]: Default to disable XIM if emacs
+        * xterm.c (use_xim) [!USE_XIM]: Default to disable XIM if Emacs
         was configured with --without-xim.
         (x_term_init) [!USE_XIM]: Use `useXIM' resource to turn on XIM.
 
@@ -4685,7 +4744,7 @@
         window to only preserve the display margins in one of the windows.
         When splitting horizontally, call adjust_window_margins on both
         windows to ensure that the text area of the new windows is non too
-        narrow.  This fixes a bug which could cause emacs to trap if the
+        narrow.  This fixes a bug which could cause Emacs to trap if the
         width of the split window was less than the width of the display
         margins.
         (window_box_text_cols): Renamed from window_internal_width.
@@ -4716,7 +4775,7 @@
         (Fset_window_margins): Do nothing if display margins are not
         really changed.  Otherwise, call adjust_window_margins to ensure
         the text area doesn't get too narrow.  This fixes a bug which
-        could cause emacs to trap if setting display margins wider than
+        could cause Emacs to trap if setting display margins wider than
         the width of the window.
         (Fset_window_fringes): New defun to allow user to specifically set
         this window's fringe widths and position vs. display margins.
@@ -7990,7 +8049,7 @@
         * process.c (Fformat_network_address): New function.
         (syms_of_process): Defsubr it.
         (list_processes_1): Use it to format :local/:remote address if
-        service/host is not set; before emacs would crash in that case.
+        service/host is not set; before Emacs would crash in that case.
         (Fmake_network_process): Don't use Ffind_operation_coding_system
         to setup coding system if host or service is not set.
 
@@ -9288,11 +9347,11 @@
 2002-07-11  Juanma Barranquero  <lektu@terra.es>
 
         * alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, coding.c,
-        composite.c, dired.c, dispnew.c, editfns.c, emacs.c, eval.c,
-        fileio.c, fns.c, insdel.c, keyboard.c, keymap.c, lread.c, macfns.c,
-        macmenu.c, macros.c, minibuf.c, print.c, process.c, sound.c,
-        textprop.c, w32fns.c, w32menu.c, window.c, xfaces.c, xfns.c,
-        xmenu.c, xselect.c, xterm.c: Use SPECPDL_INDEX wherever makes sense.
+        * composite.c, dired.c, dispnew.c, editfns.c, emacs.c, eval.c,
+        * fileio.c, fns.c, insdel.c, keyboard.c, keymap.c, lread.c, macfns.c,
+        * macmenu.c, macros.c, minibuf.c, print.c, process.c, sound.c,
+        * textprop.c, w32fns.c, w32menu.c, window.c, xfaces.c, xfns.c,
+        * xmenu.c, xselect.c, xterm.c: Use SPECPDL_INDEX wherever makes sense.
 
 2002-07-10  Juanma Barranquero  <lektu@terra.es>
 
@@ -12315,7 +12374,7 @@
 2001-12-14  Andrew Innes  <andrewi@gnu.org>
 
         * makefile.w32-in (EMACSLOADPATH): Define.
-        ($(EMACS)): Run `list-load-path-shadows' after dumping emacs.
+        ($(EMACS)): Run `list-load-path-shadows' after dumping Emacs.
         (bootstrap-temacs): Remove dependency on bootstrap-clean.
 
 2001-12-13  Eli Zaretskii  <eliz@is.elta.co.il>
@@ -13612,7 +13671,7 @@
 
 2001-10-28  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
-        * emacs.c: Use argv[0] instead of emacs when -t was specified.
+        * emacs.c: Use argv[0] instead of "emacs" when -t was specified.
 
         * keyboard.c: Change doc-string comments to `new style' [w/`doc:'
         keyword].