Merged from miles@gnu.org--gnu-2005 (patch 74-79, 332-349)

Patches applied:

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-338
   etc/emacs-buffer.gdb: Remove RCS keywords

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1 files changed, 96 insertions, 39 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8c64defd5db..dbcac952b51 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,63 @@
+2005-06-02  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (MODE_LINE_NOPROP_LEN): New macro.
+        (x_consider_frame_title, Fformat_mode_line): Save offset into
+        mode_line_noprop_buf rather than pointer, in case buffer is relocated.
+
+2005-06-01  Kim F. Storm  <storm@cua.dk>
+
+        * fns.c (mapcar1): Maybe exit loop if original sequence was modified.
+
+2005-06-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (mac_to_x_fontname, mac_do_list_fonts): Set XLFD
+        resolution fields for scalable fonts to 0.
+
+        * xfaces.c (build_scalable_font_name): Round pixel size to the
+        nearest integer.
+
+2005-06-01  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (display_mode_line): Support nested calls to redisplay
+        and format-mode-line.  Set mode_line_target to MODE_LINE_DISPLAY.
+
+2005-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fileio.c (Finsert_file_contents):
+        * xdisp.c (note_mode_line_or_margin_highlight): Lisp_Object/int mixup.
+
+2005-05-31  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (mode_line_noprop_buf, mode_line_noprop_buf_end)
+        (mode_line_noprop_ptr): Rename from frame_title_*.
+        (store_mode_line_noprop_char): Rename from store_frame_title_char.
+        (store_mode_line_noprop): Rename from store_frame_title.
+        (mode_line_target): New enum to specify current output target
+        for mode line formatting.
+        (display_mode_element): Test it rather than frame_title_ptr and
+        mode_line_string_list to determine where output should go.
+        (mode_line_proptrans_alist, mode_line_string_alist): Make static.
+        (Vmode_line_unwind_vector): New variable.
+        (format_mode_line_unwind_data, unwind_format_mode_line):
+        New functions for unwind protection in mode line formatting.
+        (x_consider_frame_title): Use them and new local var 'title_start'
+        to support nested calls to format-mode-line and redisplay.  Set
+        mode_line_target to MODE_LINE_TITLE.
+        (Fformat_mode_line): Use them and new local var 'string_start' to
+        support nested calls to format-mode-line and redisplay.  Set
+        mode_line_target to MODE_LINE_NOPROP or MODE_LINE_STRING.
+        Don't trim trailing dashes.
+        (decode_mode_spec): Don't make infinite number of trailing dashes
+        for MODE_LINE_NOPROP and MODE_LINE_STRING targets.
+        (syms_of_xdisp): Initialize and staticpro mode_line_string_face,
+        mode_line_string_face_prop, and Vmode_line_unwind_vector.
+        (init_xdisp): Initialize mode_line_noprop_ptr to start of _buf.
+        Initialize mode_line_target to MODE_LINE_DISPLAY.
+
+2005-05-29  Richard M. Stallman  <rms@gnu.org>
+
+        * buffer.c (Fbuffer_local_value): Call indirect_variable.
+
 2005-05-28  Masatake YAMATO  <jet@gyve.org>
 
         * xdisp.c (note_mode_line_or_margin_highlight): Change the
@@ -9,10 +69,9 @@
 
         * ccl.c: Now an element of Vccl_program_table is a vector of
         length 4, not 3.
-        (ccl_get_compiled_code): New arg idx.  Caller changed.  Adjusted
-        for the change of Vccl_program_table.
-        (setup_ccl_program): Adjusted for the change of
-        Vccl_program_table.
+        (ccl_get_compiled_code): New arg idx.  Caller changed.
+        Adjust for the change of Vccl_program_table.
+        (setup_ccl_program): Adjust for the change of Vccl_program_table.
         (check_ccl_update): New function.
         (Fregister_ccl_program): Use ASET to set an element of a vector.
         Adjusted for the change of Vccl_program_table.
@@ -22,7 +81,7 @@
 
 2005-05-27  Juanma Barranquero  <lekktu@gmail.com>
 
-        * image.c (Vimage_library_alist): Moved from image.el.
+        * image.c (Vimage_library_alist): Move from image.el.
         (syms_of_image): Defvar it.
         (lookup_image_type): Use it.
 
@@ -119,8 +178,7 @@
 
 2005-05-16  Andreas Schwab  <schwab@suse.de>
 
-        * unexmacosx.c (unexec_realloc): Move declarations before
-        statements.
+        * unexmacosx.c (unexec_realloc): Move declarations before statements.
 
 2005-05-14  Richard M. Stallman  <rms@gnu.org>
 
@@ -148,8 +206,8 @@
 
         * emacs.c (main) [MAC_OS8]: Call init_atimer before mac_term_init.
 
-        * keyboard.c (readable_events) [USE_TOOLKIT_SCROLL_BARS]: Regard
-        toolkit scroll bar thumb drag events as squeezable and prevent
+        * keyboard.c (readable_events) [USE_TOOLKIT_SCROLL_BARS]:
+        Regard toolkit scroll bar thumb drag events as squeezable and prevent
         redisplay from being paused by them.
 
         * mac.c [!MAC_OSX]: Include keyboard.h and syssignal.h.
@@ -157,12 +215,11 @@
         [!MAC_OSX] (check_alarm, pause, index): Remove functions.
         [!MAC_OSX && __MRC__] (sys_strftime): Likewise.
         [!MAC_OSX] (select): If fd 0 is not set in rfds and some input
-        event occurs before timeout, behave as if the function were
-        interrupted.
+        event occurs before timeout, behave as if the function were interrupted.
         [!MAC_OSX] (sigblock, sigsetmask, alarm): Simulate SIGALRM
         handling using Time Manager routines.
-        [!MAC_OSX] (mac_atimer_task, mac_atimer_qlink, signal_mask): New
-        variables.
+        [!MAC_OSX] (mac_atimer_task, mac_atimer_qlink, signal_mask):
+        New variables.
         [!MAC_OSX] (mac_atimer_handler, set_mac_atimer, remove_mac_atimer)
         (setitimer): New functions.
 
@@ -176,8 +233,8 @@
         (x_scroll_bar_handle_click): Change type of second argument from
         int to ControlPartCode.
         (check_alarm): Remove declaration.
-        (XTread_Socket) [!TARGET_API_MAC_CARBON]: Don't call it.
-        (XTread_Socket): Use ControlPartCode instead of SInt16.
+        (XTread_socket) [!TARGET_API_MAC_CARBON]: Don't call it.
+        (XTread_socket): Use ControlPartCode instead of SInt16.
 
 2005-05-13  Nozomu Ando  <nand@mac.com>
 
@@ -1981,7 +2038,7 @@
 2005-01-13  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (Fformat_mode_line): Fix last change.  Remove NO_PROPS arg
-        (specify 0 for FACE instead). Reorder arg list.  Doc fix.
+        (specify 0 for FACE instead).  Reorder arg list.  Doc fix.
 
 2005-01-12  Richard M. Stallman  <rms@gnu.org>
 
@@ -2132,7 +2189,7 @@
         fontp->space_width to FONT_WIDTH so they are valid.
 
         * w32fns.c (w32_load_system_font): Set FONT_WIDTH to maximum, not
-        average width. Set fontp->average_width and fontp->space_width to
+        average width.  Set fontp->average_width and fontp->space_width to
         their appropriate values.
 
         * w32term.c (x_new_font): Set FRAME_COLUMN_WIDTH to
@@ -2159,7 +2216,7 @@
         * xdisp.c (setup_for_ellipsis, get_next_display_element):
         Set it->ellipsis_p to 1 or 0.
         (display_line): Record whether row ends in mid-ellipsis.
-        (set_cursor_from_row): If ends in ellipsis. find start of it.
+        (set_cursor_from_row): If ends in ellipsis, find start of it.
         (cursor_row_p): If PT's at the end of the ellipsis the row
         ends within, don't display cursor on this row.
 
@@ -2862,7 +2919,7 @@
         * fringe.c (update_window_fringes): Prefer truncation bitmaps over
         angle bitmaps at top/bottom line.
 
-        * xdisp.c: Undo recent changes for restoring saved_face_id. Instead,
+        * xdisp.c: Undo recent changes for restoring saved_face_id.  Instead,
         set it when it->method is set to next_element_from_display_vector.
         (setup_for_ellipsis): Add LEN argument.  Callers changed.
         Set it->saved_face_id.
@@ -3058,7 +3115,7 @@
         * xfns.c (Fx_file_dialog): Call popup_activated instead of
         x_menu_in_use.  Call x_menu_set_in_use in Motif version also.
 
-        * xterm.h: (x_menu_in_use): Remove.
+        * xterm.h (x_menu_in_use): Remove.
 
 2004-11-16  Richard M. Stallman  <rms@gnu.org>
 
@@ -3192,7 +3249,7 @@
         (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.
+        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.
@@ -3878,7 +3935,7 @@
 
         * keyboard.c (timer_resume_idle): New function to resume idle
         timer without resetting timers on the idle list.
-        (read_char): Use timer_resume_idle. Remove local var last_idle_start.
+        (read_char): Use timer_resume_idle.  Remove local var last_idle_start.
         (timer_start_idle, timer_stop_idle): Declare static.
         (read_key_sequence): Use timer_resume_idle instead of timer_start_idle.
 
@@ -5952,7 +6009,7 @@
         elt_prefix combined with Fsingle_key_description.
         (describe_vector): Declare static.  Replace arg `elt_prefix' with
         `prefix'.  Add KEYMAP_P arg.  Add local var `elt_prefix'; use it
-        if !KEYMAP_P. Use Fkey_description with prefix instead of
+        if !KEYMAP_P.  Use Fkey_description with prefix instead of
         Fsingle_key_description.
 
         * keymap.h (Fkey_description): Fix prototype.
@@ -6167,7 +6224,7 @@
         (display_mode_line): Set mode_line_p before displaying line.
         (calc_pixel_width_or_height): Declare extern.  Add separate :align-to
         handling.  Remove complex cases for fringes and scroll-bars.
-        Add left, right, and center alignment positions. Add text (area)
+        Add left, right, and center alignment positions.  Add text (area)
         width/height.  Return width or height for image specs.
         (produce_stretch_glyph): Improve handling of :align-to.  Is now
         relative to left of text area by default, but other base offsets
@@ -10475,7 +10532,7 @@
         * intervals.h (CHECK_TOTAL_LENGTH): New macro.
         * intervals.c: Add many calls to CHECK_TOTAL_LENGTH.
 
-        * alloc.c: (VALIDATE_LISP_STORAGE): Macro deleted.
+        * alloc.c (VALIDATE_LISP_STORAGE): Macro deleted.
         All calls deleted.
         (lisp_malloc): Do the work here directly.
 
@@ -10634,7 +10691,7 @@
         (syms_of_w32fns): Don't intern/staticpro removed vars.
 
         * w32term.c: Remove unnecessary extern declarations.
-        (x_fullscreen_adjust): Remove. Use generic instead.
+        (x_fullscreen_adjust): Remove.  Use generic instead.
         (x_redisplay_interface): Add w32_frame_parm_handlers member.
 
         * w32reg.c (x_get_string_resource): Use XrmDatabase.
@@ -11860,9 +11917,9 @@
 2003-01-21  David Ponce  <david@dponce.com>
 
         * w32term.c (w32_encode_char): For DIM=1 charset, set
-        ccl->reg[2] to -1 before calling ccl_driver.  (Sync. with xterm.c
-        x_encode_char change by Kenichi Handa <handa@m17n.org> on
-        2002-09-30.)
+        ccl->reg[2] to -1 before calling ccl_driver.
+        (Sync. with xterm.c x_encode_char change by Kenichi Handa
+        <handa@m17n.org> on 2002-09-30.)
         (w32_draw_relief_rect): Declare all args.
         (w32_define_cursor): New.
 
@@ -14545,7 +14602,7 @@
 
 2002-06-27  Kim F. Storm  <storm@cua.dk>
 
-        * xdisp.c: (mode_line_string_list, mode_line_string_face)
+        * xdisp.c (mode_line_string_list, mode_line_string_face)
         (mode_line_string_face_prop): New variables.
         (store_mode_line_string): New function.
         (display_mode_element): Use store_mode_line_string to
@@ -14588,7 +14645,7 @@
 
 2002-06-24  Juanma Barranquero  <lektu@terra.es>
 
-        * w32select.c: Include composite.h
+        * w32select.c: Include composite.h.
 
         * w16select.c: Likewise.
 
@@ -15579,7 +15636,7 @@
 
         * config.in: Add HAVE_SHARED_GAME_DIR.
 
-        * callproc.c: (Vgame_score_directory): New variable.
+        * callproc.c (Vgame_score_directory): New variable.
         (syms_of_callproc) <Vgame_score_directory>: DEFVAR_LISP.
 
 2002-04-10  Richard M. Stallman  <rms@gnu.org>
@@ -16127,7 +16184,7 @@
 
         * xterm.h (x_session_check_input, x_session_initialize): Declare.
 
-        * xterm.c: (XTread_socket): Add call to x_session_check_input and
+        * xterm.c (XTread_socket): Add call to x_session_check_input and
         x_session_have_connection.
         (x_initialize): Add call to x_session_initialize.
 
@@ -16544,10 +16601,10 @@
 
 2002-02-17  Kim F. Storm  <storm@cua.dk>
 
-        * frame.c: (Vmouse_highlight): New variable.
+        * frame.c (Vmouse_highlight): New variable.
         (syms_of_frame): DEFVAR_LISP it.
 
-        * frame.h: (Vmouse_highlight): Declare extern.
+        * frame.h (Vmouse_highlight): Declare extern.
 
         * xterm.h (struct x_display_info): Add mouse_face_hidden.
 
@@ -18072,7 +18129,7 @@
 
 2001-11-16  Eli Zaretskii  <eliz@is.elta.co.il>
 
-        * syswait.h: (HAVE_SYS_WAIT_H): Undef for ISC 4.1.  Reported by
+        * syswait.h (HAVE_SYS_WAIT_H): Undef for ISC 4.1.  Reported by
         Andrew Wiseman <a.wiseman@btclick.com>.
 
 2001-11-16  Kim F. Storm  <storm@cua.dk>
@@ -18760,7 +18817,7 @@
 
         * xterm.c: Fix typo in a comment.
 
-        * lisp.h: (gdb_lisp_params): Remove code in #if 0 which is now in
+        * lisp.h (gdb_lisp_params): Remove code in #if 0 which is now in
         emacs.c.
 
 2001-10-27  Gerd Moellmann  <gerd@gnu.org>
@@ -18884,7 +18941,7 @@
 
 2001-10-24  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
-        * xterm.c: (x_insert_glyphs): Remove unused variables `real_end'
+        * xterm.c (x_insert_glyphs): Remove unused variables `real_end'
         and `real_start'.
         (x_draw_image_foreground): Remove unused variables `mask' and `xgcv'.
         (glyph_rect): Remove unused variable `area'.
@@ -18916,7 +18973,7 @@
         (HAVE_BOXES): Fix typo in comment.
         (push_menu_pane): Fix typo in comment.
 
-        * xdisp.c: (display_prop_string_p): Remove unused local declaration
+        * xdisp.c (display_prop_string_p): Remove unused local declaration
         of `Qwhen'.
         (single_display_prop_string_p): Remove unused local declarations
         of `Qwhen' and `Qmargin'.