Merged in changes from CVS trunk.

Patches applied:

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-640
   Merge from gnus--rel--5.10

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-650
   Merge from gnus--rel--5.10

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

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-59
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-60
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-61
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-62
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-63
   Update from CVS


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

1 files changed, 86 insertions, 15 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1490b34b4a9..8479a0f94ce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,74 @@
+2004-10-28  Will  <will@glozer.net>
+
+        * macterm.c: allow user to assign key modifiers to the Mac Option
+        key via a 'mac-option-modifier' variable.
+
+2004-10-28  Stefan  <monnier@iro.umontreal.ca>
+
+        * xselect.c (Vx_lost_selection_functions, Vx_sent_selection_functions):
+        Rename from Vx_lost_selection_hooks and Vx_sent_selection_hooks.
+        (x_handle_selection_request, x_handle_selection_clear)
+        (x_clear_frame_selections, syms_of_xselect): Adjust accordingly.
+
+2004-10-28  Richard M. Stallman  <rms@gnu.org>
+
+        * w32fns.c (Fx_server_vendor, Fx_server_version): Doc fixes.
+
+        * xfns.c (Fx_server_vendor, Fx_server_version): Doc fixes.
+
+2004-10-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * syntax.c (scan_sexps_forward): Give precedence to a 2-char
+        comment-starter over a 1-char one.
+
+2004-10-27  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (get_next_display_element): In mode lines,
+        treat newline and tab like other control characters.
+
+        * editfns.c (Fmessage): Doc fix.
+
+        * indent.c (vmotion): When moving up, check the newline before.
+        Make prevline an int, not a Lisp_Object.
+
+2004-10-27  Kim F. Storm  <storm@cua.dk>
+
+        * editfns.c (Fformat): Allocate discarded table with SAFE_ALLOCA.
+        Only allocate info and discarded tables once.
+
+        * lisp.h (USE_SAFE_ALLOCA): Add and init sa_must_free integer.
+        (SAFE_ALLOCA, SAFE_ALLOCA_LISP): Increment it when malloc is used.
+        (SAFE_FREE): Test it to determine if we need to unwind to free.
+        Remove size arg.  All users changed.
+        (SAFE_FREE_LISP) Remove.  All users changed to use SAFE_FREE.
+
+2004-10-26  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c: Put empty line between comment and function body.
+        (xg_destroy_widgets): Rename from remove_from_container.
+        Just destroy all widgets in list.  Argument wcont removed.
+        (xg_update_menubar, xg_update_submenu): Call xg_destroy_widgets
+        instead of remove_from_container.
+        (xg_display_close, xg_create_tool_bar, update_frame_tool_bar)
+        (free_frame_tool_bar): Add comment.
+
+        * xfns.c (xic_create_xfontset): Check that FRAME_XIC_BASE_FONTNAME
+        is not NULL before strcmp.
+
+2004-10-26  Kim F. Storm  <storm@cua.dk>
+
+        * callint.c (Fcall_interactively): Add 'U' code to get the
+        up-event discarded by a previous 'k' or 'K' argument.
+
+2004-10-26  David Kastrup  <dak@gnu.org>
+
+        * buffer.c (syms_of_buffer): Fix a few typos.
+
+2004-10-26  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xsmfns.c: Put empty line between comment and function body.
+        Use two spaces before comment end.
+
 2004-10-25  Kenichi Handa  <handa@m17n.org>
 
         * fontset.c (fontset_pattern_regexp): Optimize for the case that
@@ -21,17 +92,17 @@
 
 2004-10-21  K,Aa(Broly L$,1 q(Brentey  <lorentey@elte.hu>
 
-        * xterm.h (x_output): New member `xic_base_fontname'.
-        (FRAME_XIC_BASE_FONTNAME): New macro.
-        (xic_free_xfontset): Declare.
+        * xterm.h (x_output): New member `xic_base_fontname'.
+        (FRAME_XIC_BASE_FONTNAME): New macro.
+        (xic_free_xfontset): Declare.
 
-        * xfns.c (xic_create_xfontset): Share fontsets between frames
-        based on base_fontname.
-        (xic_free_xfontset): New function.
-        (free_frame_xic): Use it.
-        (xic_set_xfontset): Ditto.
+        * xfns.c (xic_create_xfontset): Share fontsets between frames
+        based on base_fontname.
+        (xic_free_xfontset): New function.
+        (free_frame_xic): Use it.
+        (xic_set_xfontset): Ditto.
 
-        * xterm.c (xim_destroy_callback): Ditto.
+        * xterm.c (xim_destroy_callback): Ditto.
 
 
 2004-10-20  B. Anyos  <banyos@freemail.hu>  (tiny change)
@@ -75,10 +146,10 @@
 
         * gtkutil.h (xg_update_scrollbar_pos): Remove arguments real_left
         and canon_width.
-        (xg_frame_cleared): Removed.
+        (xg_frame_cleared): Remove.
 
-        * gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
-        xg_find_top_left_in_fixed): Removed.
+        * gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose)
+        (xg_find_top_left_in_fixed): Remove.
         (xg_create_scroll_bar): Put an event box widget between
         the scroll bar widget and the edit widget.
         (xg_show_scroll_bar): Show the parent widget (the event box).
@@ -87,11 +158,11 @@
         Move the parent (the event box) widget inside the fixed widget.
         Move window clear to xterm.c.
 
-        * gtkutil.h (xg_frame_cleared): Removed.
+        * gtkutil.h (xg_frame_cleared): Remove.
 
         * xterm.c (x_clear_frame): Remove call to xg_frame_cleared
-        (x_scroll_bar_create, XTset_vertical_scroll_bar): Remove
-        arguments left and width to xg_update_scrollbar_pos.
+        (x_scroll_bar_create, XTset_vertical_scroll_bar):
+        Remove arguments left and width to xg_update_scrollbar_pos.
         (XTset_vertical_scroll_bar): Do x_clear_area for USE_GTK also.
 
 2004-10-19  Kenichi Handa  <handa@m17n.org>