Merged from miles@gnu.org--gnu-2005 (patch 68, 286-291)

Patches applied:

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-68
   Update from CVS

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

1 files changed, 82 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 47d24852a66..02a81fb7f7c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,85 @@
+2005-05-05  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * eval.c (Fdefvaralias): Doc fix.
+
+        * xmenu.c (Fx_popup_menu, Fx_popup_dialog): Doc fixes.
+
+2005-05-05  Kim F. Storm  <storm@cua.dk>
+
+        * buffer.c (init_buffer_once): Set cursor_in_non_selected_windows
+        default value.
+        (syms_of_buffer): Add default-cursor-in-non-selected-windows.
+        Fix type of cursor-in-non-selected-windows.
+
+2005-05-03  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * mac.c: #undef init_process so not to conflict with system headers.
+
+2005-05-02  Richard M. Stallman  <rms@gnu.org>
+
+        * buffer.c (syms_of_buffer): Define cursor-in-non-selected-windows.
+
+        * buffer.h (struct buffer): Add cursor_in_non_selected_windows slot.
+
+        * xdisp.c (Vcursor_in_non_selected_windows)
+        (Qcursor_in_non_selected_windows): Vars deleted.
+        (syms_of_xdisp): Don't initialize them.
+        (get_window_cursor_type): Use cursor_in_non_selected_windows
+        buffer slot.
+
+2005-05-02  Kim F. Storm  <storm@cua.dk>
+
+        * macros.c (executing_kbd_macro_index): Rename from
+        executing_macro_index.  All uses changed.
+        (executing_kbd_macro_iterations): Rename from
+        executing_macro_iterations.  All uses changed.
+        (executing_kbd_macro): Rename from executing_macro.
+        All uses changed.
+        (syms_of_macros): Rename Lisp var executing-macro-index to
+        executing-kbd-macro-index.
+
+        * xdisp.c (move_it_in_display_line_to): Fix last change.
+
+2005-05-01  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * xmenu.c (Fx_popup_menu): Doc fix.
+
+        * charset.c (syms_of_charset): Delete defsubr for Schars_in_region.
+
+2005-05-02  Jason Rumney  <jasonr@gnu.org>
+
+        * emacs.c (USAGE3, USAGE4): Keep strings below 2048 bytes.
+
+2005-05-02  Nozomu Ando  <nand@mac.com>
+
+        * sysselect.h: Fix typo.
+
+2005-05-02  Nick Roberts  <nickrob@snap.net.nz>
+
+        * charset.c (Fchars_in_region): Remove as obsolete.
+
+2005-05-01  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (move_it_in_display_line_to): Stop if we move beyond
+        TO_CHARPOS. This may happen if last glyphs was an image or stretch
+        glyph.
+
+2005-05-01  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * dispnew.c (sit_for): Vexecuting_macro -> Vexecuting_kbd_macro.
+
+2005-05-01  Richard M. Stallman  <rms@gnu.org>
+
+        * xmenu.c [not HAVE_X_TOOLKIT] (xmenu_show):
+        If user cancels the menu, quit unless FOR_CLICK.
+
+        * macros.c (Vexecuting_kbd_macro): Renamed from Vexecuting_macro.
+        All uses changed.
+        (syms_of_macros): Define only executing-kbd-macro, not executing-macro.
+        * keyboard.c: Change Vexecuting_macro to Vexecuting_kbd_macro.
+        * macros.h (Vexecuting_kbd_macro): Declare instead of Vexecuting_macro.
+        * commands.h (Vexecuting_kbd_macro): Likewise.
+
 2005-05-01  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * sysdep.c (get_frame_size) [VMS]: Use a fresh i/o channel.