Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 357-381)

   - Merge from gnus--rel--5.10
   - Update from CVS
   - Merge from erc--emacs--21

 * gnus--rel--5.10  (patch 116-122)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-98

1 files changed, 89 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1ea2005e0c4..474ead0cde6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,84 @@
+2006-08-01  Kim F. Storm  <storm@cua.dk>
+
+        * process.c (wait_reading_process_output_unwind): New function.
+        Restores waiting_for_user_input_p to saved value.
+        (wait_reading_process_output): Unwind protect waiting_for_user_input_p
+        instead of save/restore old value on stack.
+
+2006-07-30  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * editfns.c: Undo 2006-06-27 change.
+
+2006-07-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * coding.c (Ffind_operation_coding_system): Revert the change from
+        2006-05-29.
+
+        * alloc.c [WINDOWSNT]: Include fcntl.h, to fix last change.
+
+2006-07-28  Richard Stallman  <rms@gnu.org>
+
+        * xfaces.c (lookup_named_face, Fdisplay_supports_face_attributes_p):
+        Add conditional aborts for clarity.
+
+        * xdisp.c (update_menu_bar): New arg HOOKS_RUN.  Callers changed.
+        Used to avoid running the hooks over and over for each frame.
+        (prepare_menu_bars): Pass value from update_menu_bar
+        as HOOKS_RUN of next call.
+
+        * keyboard.c (safe_run_hooks_1): Don't crash if Vrun_hooks is nil.
+
+2006-07-28  Kim F. Storm  <storm@cua.dk>
+
+        * alloc.c (valid_pointer_p): New function (from valid_lisp_object_p).
+        (valid_lisp_object_p): Use it to check for valid SUBRP obj.
+
+2006-07-26  Chong Yidong  <cyd@stupidchicken.com>
+
+        * keyboard.c (read_char): New arg END_TIME specifying timeout.
+        All callers changed.  Turn off echoing if END_TIME is non-NULL.
+        (kbd_buffer_get_event): New arg END_TIME.
+
+        * lread.c (read_filtered_event): New arg SECONDS to wait until.
+        (Fread_char, Fread_event, Fread_char_exclusive): New arg SECONDS.
+
+        * lisp.h: Update read-char, read-event, and read_filtered_event
+        prototypes.
+
+        * keyboard.h: Include systime.h.  Update read_char prototype.
+
+2006-07-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * alloc.c (find_string_data_in_pure): New function.
+        (make_pure_string): Use it to reuse existing string data if possible.
+
+        * puresize.h (BASE_PURESIZE): Decrease to 1102000.
+
+2006-07-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymap.c (Fdefine_key): If the key binding definition looks like an
+        XEmacs-style key sequence, convert it to Emacs's format.
+
+2006-07-22  Ralf Angeli  <angeli@caeruleus.net>
+
+        * w32fns.c (w32_createwindow): If `left' and/or `top' frame
+        parameters are bound to some values, use that instead of
+        CW_USEDEFAULT.
+
+2006-07-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (convert_time): Use explicit long double constants to
+        ensure long double arithmetics is used throughout.
+
+2006-07-20  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp): New vars.
+        (init_alloc_once): Initialize them.
+        (pure_alloc): Allocate non-Lisp objects from the end of pure storage
+        without alignment.
+
+        * puresize.h (BASE_PURESIZE): Decrease to 1141000.
+
 2006-07-18  Francis Litterio  <franl@world.std.com>
 
         * w32term.c (x_calc_absolute_position): Fix frame positioning
@@ -131,6 +212,14 @@
         (mac_initialize_display_info) [MAC_OSX]: Use CGDisplaySamplesPerPixel.
         (x_delete_display): Apply 2006-07-04 change for xterm.c.
 
+2006-07-17  Richard Stallman  <rms@gnu.org>
+
+        * keyboard.c (Vcommand_error_function): New variable.
+        (syms_of_keyboard): Defvar it.
+        (cmd_error_internal): Simplify, and handle Vcommand_error_function.
+
+        * dispnew.c (init_display): Mention DISPLAY as well as TERM in err msg.
+
 2006-07-17  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (handle_single_display_spec): Ensure the right value of