Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1 files changed, 200 insertions, 15 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b65bb2d5714..cc9e71290d5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,189 @@
+2004-11-12  Kim F. Storm  <storm@cua.dk>
+
+        * dispextern.h (struct glyph_row): New member extra_line_spacing.
+        (struct it): New member max_extra_line_spacing.
+        (MR_PARTIALLY_VISIBLE, MR_PARTIALLY_VISIBLE_AT_TOP)
+        (MR_PARTIALLY_VISIBLE_AT_BOTTOM): New helper macros.
+        (MATRIX_ROW_PARTIALLY_VISIBLE_P): Fix to return false if invisible
+        part of last line is only extra line spacing (so the text on the
+        line is fully visible). Use helper macros.
+        Add W arg (to use them).  All callers changed.
+        (MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P)
+        (MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P): Use helper macros.
+
+        * window.c (window_scroll_pixel_based, Frecenter): Use
+        move_it_vertically_backward directly.
+        (Frecenter): Fix calculation of new start pos for negative arg.
+        Before, the new start pos was sometimes chosen too far back, so
+        the last line became only partially visible, and thus would be
+        either only semi-visible or automatically scrolled to the middle
+        of the window by redisplay.
+
+        * xdisp.c (init_iterator): Clear it.max_extra_line_spacing.
+        (move_it_vertically_backward): Don't recure to move further back.
+        (move_it_vertically): Remove superfluous condition.
+        (move_it_by_lines): Clear last_height when moved 0 lines.
+        (resize_mini_window): use it.max_extra_line_spacing.
+        (display_tool_bar_line): Clear row->extra_line_spacing.
+        (try_scrolling): Use move_it_vertically_backward directly.
+        (redisplay_window): Likewise.
+        (compute_line_metrics): Set row->extra_line_spacing.
+        (display_line, display_string): Likewise.
+        (x_produce_glyphs): Update it->max_extra_line_spacing.
+
+        * xmenu.c (pop_down_menu): Return nil.
+
+2004-11-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (x_menu_wait_for_event): New function.
+        (popup_get_selection, popup_widget_loop):  Call x_menu_wait_for_event
+        to handle timers.
+        (popup_widget_loop): Add argument do_timers.
+        (create_and_show_popup_menu, create_and_show_dialog): Pass 1 for
+        do_timers to popup_widget_loop.
+        (xmenu_show): Call XMenuActivateSetWaitFunction so that
+        x_menu_wait_for_event is called by XMenuActivate.
+        (create_and_show_popup_menu): Pass 1 for do_timers to
+        popup_get_selection.
+        (pop_down_menu): New function.
+        (popup_get_selection, popup_widget_loop): Unwind protect to
+        pop_down_menu.
+        (popup_widget_loop): Add argument widget.
+        (create_and_show_popup_menu, create_and_show_dialog): Pass new
+        argument widget to popup_widget_loop.
+
+2004-11-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymap.c (Fkeymap_prompt): Accept symbol keymaps.
+
+2004-11-09  Kim F. Storm  <storm@cua.dk>
+
+        * xselect.c: Include <sys/types.h> and <unistd.h> (for getpid).
+        Fix various comments referring to XEvents instead of input events.
+        (x_queue_event): Fix format strings.
+        (x_stop_queuing_selection_requests): Likewise.
+
+        * xdisp.c (produce_image_glyph): Remove unused variable 'face_ascent'.
+        (pint2hrstr): Add extra braces to silence compiler.
+
+        * print.c (print_object): Fix format string.
+
+        * lread.c (read1): Fix next_char matching.
+
+        * lisp.h (Fdelete): Add EXFUN.
+        (replace_range_2): Add prototype.
+
+        * keyboard.c (read_avail_input): Remove unused variable 'discard'.
+
+        * intervals.h (NULL_INTERVAL_P): Add separate version when
+        ENABLE_CHECKING is not defined to silence compiler.
+        (compare_string_intervals): Add prototype.
+
+        * fringe.c (destroy_fringe_bitmap): Fix return type.
+        (Ffringe_bitmaps_at_pos): Remove unused var 'old_buffer'.
+
+        * emacs.c (Fdump_emacs): Fix format string.
+
+        * doc.c: Include <ctype.h>.
+        (Fsubstitute_command_keys): Remove unused variable 'firstkey'.
+
+        * data.c (store_symval_forwarding): Remove unused variables.
+
+        * callint.c (Fcall_interactively): Remove unused variable 'funcar'.
+
+2004-11-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * Makefile.in (stamp-oldxmenu): If HAVE_GTK, don't add dependencies
+        to ${OLDXMENU}.
+
+2004-11-09  Kim F. Storm  <storm@cua.dk>
+
+        * process.c (Fmake_network_process): Remove kludge for interrupted
+        connects on BSD.  If connect is interrupted, just close socket and
+        start over rather than sleeping and retry with same socket.
+
+2004-11-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * .cvsignore: Add buildobj.lst.
+
+        * doc.c: New variable Vbuild_files.
+        (Fsnarf_documentation): If Vbuild_files is nil, populate it with
+        file names from buildobh.lst.  Only attach docstrings from files
+        that are in Vbuild_files.
+        (syms_of_doc): Defvar Vbuild_files.
+
+        * Makefile.in (SOME_MACHINE_OBJECTS): Add fringe.o, image.o
+        and w32*.o.
+        (temacs${EXEEXT}): Generate buildobj.lst when temacs is linked.
+        (mostlyclean): rm buildobj.lst
+
+        * makefile.w32-in ($(TEMACS)): Generate buildobj.lst when temacs
+        is linked.
+
+2004-11-09  Kim F. Storm  <storm@cua.dk>
+
+        * fringe.c (update_window_fringes): Update fringe bitmaps if
+        cur and row ends_at_zv_p differs.  If bitmaps of a row is updated,
+        also update previous row to get rid of misc. artifacts.
+
+2004-11-08  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (fast_find_position): Fix start pos if header line present.
+        (note_mouse_highlight): Clear mouse face if we move out of text area.
+
+2004-11-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * editfns.c: Move #include "systime.h" before <sys/resource.h>.
+        Don't include <sys/time.h> explicitly.
+        Include <stdio.h> unconditionally, not just on MacOS.
+
+2004-11-08  Kenichi Handa  <handa@m17n.org>
+
+        * fontset.c (fontset_pattern_regexp): Cancel my previous change;
+        don't pay attention to '\' before '*'.
+        (fontset_pattern_regexp): Change the meaning of the second arg.
+        (Fnew_fontset): Call fs_query_fontset, not Fquery_fontset.
+        (check_fontset_name): Try NAME as literal at first, and if it
+        failes, try NAME as pattern.
+
+2004-11-07  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * emacs.c (Fdump_emacs): Only output warning on GNU/Linux.
+
+2004-11-07  Andreas Schwab  <schwab@suse.de>
+
+        * lisp.h: Declare Fmsdos_downcase_filename.
+        * dired.c: Don't declare Fmsdos_downcase_filename.
+        * fileio.c: Likewise.
+
+2004-11-07  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * dosfns.c (Fdos_memget, Fdos_memput): Use integer variable offs in
+        comparisons with integers instead of Lisp_Object address.
+        (Fmsdos_set_keyboard): Declare argument allkeys.
+
+        * msdos.c (IT_set_frame_parameters): Use EQ, not ==, for Lisp_Object:s.
+
+        * dired.c: extern declare Fmsdos_downcase_filename on MSDOS to avoid
+        int/Lisp_Object mixup.
+
+        * fileio.c: Ditto.
+
+2004-11-06  Steven Tamm  <steventamm@mac.com>
+
+        * editfns.c: Need to include sys/time.h before resource.h on darwin.
+
+2004-11-06  Richard M. Stallman  <rms@gnu.org>
+
+        * callint.c (Fcall_interactively): Avoid reusing EVENT for other data.
+
+        * xfaces.c (merge_named_face): GCPRO the face_name in the
+        named_merge_point struct that we make.
+        (merge_face_heights): Eliminate GCPRO arg.  All callers changed.
+
+        * keyboard.c (command_loop_1): Change Vtransient_mark_mode
+        before deciding whether to inactivate mark.
+
 2004-11-06  Lars Brinkhoff  <lars@nocrew.org>
 
         * config.in: Regenerate (add HAVE_GETRUSAGE).
@@ -16,7 +202,6 @@
 
         * xmenu.c (popup_get_selection, create_and_show_popup_menu)
         (create_and_show_dialog): Revert change from 2004-10-31.
-        
 
 2004-11-05  Luc Teirlinck  <teirllm@auburn.edu>
 
@@ -37,8 +222,8 @@
         (x_stop_queuing_selection_requests): Add new queue for selection
         input events to replace previous XEvent queue in xterm.c.
         (queue_selection_requests_unwind): Adapt to new queue.
-        (x_reply_selection_request): Adapt to new queue.  Unexpect
-        wait_object in case of x errors (memory leak).
+        (x_reply_selection_request): Adapt to new queue.
+        Unexpect wait_object in case of x errors (memory leak).
         (x_handle_selection_request, x_handle_selection_clear): Make static.
         (x_handle_selection_event): New function.  May queue selection events.
         (wait_for_property_change_unwind): Use save_value instead of cons.
@@ -91,7 +276,7 @@
         * gtkutil.h: Declare use_old_gtk_file_dialog.
 
         * gtkutil.c: Make use_old_gtk_file_dialog non-static.
-        (xg_initialize): Moved DEFVAR_BOOL for use_old_gtk_file_dialog ...
+        (xg_initialize): Move DEFVAR_BOOL for use_old_gtk_file_dialog ...
         * xfns.c (syms_of_xfns): ... to here.
 
         * gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
@@ -166,20 +351,20 @@
 
         * lisp.h: Fx_file_dialog takes 5 parameters.
 
-        * xfns.c (Fx_file_dialog): Both Motif and GTK version:  Add
-        parameter only_dir_p.
+        * xfns.c (Fx_file_dialog): Both Motif and GTK version:
+        Add parameter only_dir_p.
         In Motif version, don't put DEFAULT_FILENAME in filter part of the
         dialog, just text field part.  Do not add DEFAULT_FILENAME
         to list of files if it isn't there.
         In GTK version, pass only_dir_p parameter to xg_get_file_name.
 
-        * macfns.c (Fx_file_dialog): Add parameter only_dir_p.  Check
-        only_dir_p instead of comparing prompt to "Dired".  When using
+        * macfns.c (Fx_file_dialog): Add parameter only_dir_p.
+        Check only_dir_p instead of comparing prompt to "Dired".  When using
         a save dialog, add option kNavDontConfirmReplacement, change title
         to "Enter name", change text for save button to "Ok".
 
-        * w32fns.c (Fx_file_dialog): Add parameter only_dir_p.  Check
-        only_dir_p instead of comparing prompt to "Dired".
+        * w32fns.c (Fx_file_dialog): Add parameter only_dir_p.
+        Check only_dir_p instead of comparing prompt to "Dired".
 
         * gtkutil.c (xg_get_file_with_chooser)
         (xg_get_file_with_selection): New functions, only defined ifdef
@@ -196,8 +381,8 @@
 
 2004-11-01  Kim F. Storm  <storm@cua.dk>
 
-        * process.c (connect_wait_mask, num_pending_connects): Only
-        declare and use them if NON_BLOCKING_CONNECT is defined.
+        * process.c (connect_wait_mask, num_pending_connects):
+        Only declare and use them if NON_BLOCKING_CONNECT is defined.
         (init_process): Initialize them if NON_BLOCKING_CONNECT defined.
         (IF_NON_BLOCKING_CONNECT): New helper macro.
         (wait_reading_process_output): Only declare and use local vars
@@ -212,8 +397,8 @@
         * xmenu.c: Add prototypes for forward function declarations.
         (popup_get_selection): Remove parameter do_timers, remove call to
         timer_check.
-        (create_and_show_popup_menu, create_and_show_dialog): Remove
-        parameter do_timers from call to popup_get_selection.
+        (create_and_show_popup_menu, create_and_show_dialog):
+        Remove parameter do_timers from call to popup_get_selection.
 
         * xdisp.c (update_tool_bar): Pass a copy of f->tool_bar_items to
         tool_bar_items and assign the result to f->tool_bar_items if
@@ -232,7 +417,7 @@
         * 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>
+2004-10-28  Stefan Monnier  <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.