Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--gnus--5.10--base-0
   tag of miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-464

 * miles@gnu.org--gnu-2004/emacs--gnus--5.10--patch-1
   Import from CVS branch gnus-5_10-branch

 * miles@gnu.org--gnu-2004/emacs--gnus--5.10--patch-2
   Merge from lorentey@elte.hu--2004/emacs--multi-tty--0, emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/emacs--gnus--5.10--patch-3
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--gnus--5.10--patch-4
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-19
   Remove autoconf-generated files from archive

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


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

1 files changed, 51 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 77a331a7802..8fd72a29c29 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,54 @@
+2004-09-03  Jason Rumney  <jasonr@gnu.org>
+
+        * w32menu.c (_widget_value): Added lname and lkey.
+        (digest_single_submenu): Set lname and lkey in widget_value
+        instead of name and key.
+        (update_submenu_strings): New function.
+        (set_frame_menubar): Remove call to inhibit_garbage_collection,
+        call update_submenu_strings.
+
+        * w32menu.c (globals_of_w32menu): Check for Unicode API.
+        (digest_single_submenu, w32_menu_show): Encode menu strings as
+        UTF-8 if Unicode API is available.
+        (utf8to16): New function.
+        (add_menu_item): Use it when calling Unicode API.
+        
+2004-09-03  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (set_cursor_from_row): Look for non-nil `cursor' property
+        in overlay or text-property strings; set cursor on corresponding
+        glyph rather than at end of the string.
+
+2004-09-02  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macfns.c (x_real_positions): Save the current window port and
+        set a new one before obtaining the global coordinate.  Use
+        FRAME_MAC_WINDOW.
+        (x_set_name, x_set_title): Encode title to UTF8.  Use
+        SetWindowTitleWithCFString.
+        (Fx_server_version): Get correct OS version.
+
+        * macmenu.c (add_menu_item): Remove unused variable `i'.  Don't
+        let separator items destroy refence constants of other menu items.
+
+        * macterm.c (x_update_end): Move SetPortWindowPort to inside
+        BLOCK_INPUT.
+        (x_set_offset): Use FRAME_MAC_WINDOW.
+
+        * xdisp.c (note_mouse_highlight): Set the mouse pointer shape to
+        nontext_cursor if it is on a scroll bar.
+
+        * s/darwin.h (LIBS_CARBON): New define to specify libraries for
+        Carbon support.
+        (LD_SWITCH_SYSTEM_TEMACS): Don't link with unused libstdc++.  Use
+        LIBS_CARBON.
+
+2004-09-02  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xfns.c (x_set_name_internal): New function.  Check if we shall call
+        xfree before ENCODE_UTF_8.
+        (x_set_name, x_set_title): Call x_set_name_internal.
+
 2004-08-31  NAKAMURA Toshikazu  <nr-tkz@nifty.com>  (tiny change)
 
         * w32fns.c (w32_load_font): If a BDF font is already loaded, do not