Merged from miles@gnu.org--gnu-2005 (patch 447-448)

Patches applied:

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

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

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

1 files changed, 51 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2ffb3c4959c..046d1a321fe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,54 @@
+2005-06-25  Richard M. Stallman  <rms@gnu.org>
+
+        * macfns.c (Fx_show_tip): Pass new arg to try_window.
+
+        * w32fns.c (Fx_show_tip): Pass new arg to try_window.
+
+        * xfns.c (Fx_show_tip): Pass new arg to try_window.
+
+        * xdisp.c (try_window): New arg CHECK_MARGINS.  Calls changed.
+        (redisplay_window): Handle try_window reporting point in scroll margin.
+
+        * dispextern.h (try_window): Declare new arg.
+
+        * fileio.c (Fcopy_file): New arg PRESERVE_UID_GID.
+        Use fchmod to copy the file modes.
+        (Frename_file): Don't copy UID and GID here;
+        instead, specify t for PRESERVE_UID_GID when calling Fcopy_file.
+
+        * eval.c (call_debugger): Take full care of extending stack limits
+        to make space for the debugger, and restore the change afterward.
+        Bind debug-on-error to nil.
+        (restore_stack_limits): New subroutine.
+        (Fsignal): Extend specpdl bound along with eval depth bound,
+        for calling edebug.  Don't do either one, for calling debugger.
+        (find_handler_clause): Don't bind debug-on-error here.
+        Don't unbind anything either.
+        Temporarily advance max_specpdl_size for calling
+        internal_with_output_to_temp_buffer.
+        (grow_specpdl): Don't alter max_specpdl_size before signaling
+        an error.
+        (syms_of_eval) <max-specpdl-size>: Doc fix.
+
+        * lread.c (read1): 0.0e+NaN should make a "positive" NaN.
+
+2005-06-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * fileio.c (Frename_file): Undo last change: no need to ifdef away
+        chown on DOS_NT platforms.
+
+        * w32.c (sys_chown): New function.
+
+        * s/ms-w32.h (chown): New; define to sys_chown.
+
+2005-06-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * xdisp.c (syms_of_xdisp) <nobreak-char-display>: Doc fix.
+        (syms_of_xdisp) <void-text-area-pointer>: Doc fix.
+
+        * fileio.c (Frename_file)[!DOS_NT]: Don't call chown on
+        MSDOS/Windows.
+
 2005-06-23  Richard M. Stallman  <rms@gnu.org>
 
         * xdisp.c (get_next_display_element): Finish reversing the tests of