Merged in changes from CVS HEAD

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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


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

13 files changed, 459 insertions, 188 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c1a63aab953..bb8ef04bc67 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,78 @@
+2004-03-04  Richard M. Stallman  <rms@gnu.org>
+
+        * s/sol2-6.h (LD_SWITCH_SYSTEM_TEMACS): New definition.
+
+        * window.c (Fdisplay_buffer): Doc fix.
+
+        * buffer.c (Fpop_to_buffer): Doc fix.
+
+2004-03-03  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (display_line): Fix call to get_overlay_arrow_glyph_row.
+
+2004-03-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * editfns.c (Ftranslate_region): Lisp_Object/int mixup.
+
+2004-03-02  Richard M. Stallman  <rms@gnu.org>
+
+        * indent.c (compute_motion): Save vpos in prev_vpos, like hpos etc.
+
+2004-03-02  Kenichi Handa  <handa@m17n.org>
+
+        * doc.c (Fsubstitute_command_keys): Fix counding bytes.
+
+2004-03-02  Kim F. Storm  <storm@cua.dk>
+
+        * window.h (struct window): New member overlay_arrow_bitmap.
+
+        * window.c (make_window): Initialize overlay_arrow_bitmap.
+
+        * xdisp.c (Voverlay_arrow_variable_list): New variable to properly
+        implement and integrate multiple overlay arrows with redisplay.
+        (syms_of_xdisp): DEFVAR_LISP and initialize it.
+        (last_arrow_position, last_arrow_string): Replace by properties.
+        (Qlast_arrow_position, Qlast_arrow_string)
+        (Qoverlay_arrow_string, Qoverlay_arrow_bitmap): New variables.
+        (syms_of_xdisp): Intern and staticpro them.
+        (overlay_arrow_string_or_property, update_overlay_arrows)
+        (overlay_arrow_in_current_buffer_p, overlay_arrows_changed_p)
+        (overlay_arrow_at_row): New functions for multiple overlay arrows.
+        (redisplay_internal): Use them instead of directly accessing
+        Voverlay_arrow_position etc. for multiple overlay arrows.
+        (mark_window_display_accurate): Use update_overlay_arrows.
+        (try_cursor_movement): Use overlay_arrow_in_current_buffer_p.
+        (try_window_id): Use overlay_arrows_changed_p.
+        (get_overlay_arrow_glyph_row): Add overlay_arrow_string arg.
+        (display_line): Use overlay_arrow_at_row to check multiple
+        overlay arrows, and get relevant overlay-arrow-string and
+        overlay-arrow-bitmap.  Set w->overlay_arrow_bitmap accordingly.
+        (produce_image_glyph): Set pixel_width = 0 for fringe bitmap.
+        (syms_of_xdisp): Remove last_arrow_position and last_arrow_string.
+
+        * fringe.c (draw_fringe_bitmap): Use w->overlay_arrow_bitmap if set.
+        (update_window_fringes): Remove unused code.
+
+2004-03-01  Jason Rumney  <jasonr@gnu.org>
+
+        * w32term.c (w32_read_socket): Fix last change to ButtonPress handling.
+
+2004-03-01  Juanma Barranquero  <lektu@terra.es>
+
+        * fringe.c (Fdefine_fringe_bitmap): Fix typo in docstring.
+
+        * makefile.w32-in ($(BLD)/fringe.$(O)): Add dependencies.
+
+2004-03-01  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xfns.c (Fx_display_color_cells): Use number of planes to calculate
+        how many colors can be displayed.
+
+2004-03-01  Kenichi Handa  <handa@m17n.org>
+
+        * editfns.c (Ftranslate_region): Handle multibyte chars in TABLE
+        correctly.
+
 2004-02-28  Kim F. Storm  <storm@cua.dk>
 
         * dispnew.c (update_window): Update header line also if there are
@@ -11,11 +86,11 @@
 
 2004-02-28  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
-        * xfns.c (x_window): Fixed indentation.
+        * xfns.c (x_window): Fix indentation.
 
         * xterm.c (x_calc_absolute_position): Call x_real_positions
         to get WM window sizes and use those to calculate position.
-        (x_set_offset): Removed code commented out.
+        (x_set_offset): Remove code commented out.
 
 2004-02-28  Miles Bader  <miles@gnu.org>
 
@@ -39,7 +114,7 @@
         * keyboard.h (kbd_buffer_store_event_hold): Add prototype.
         (gen_help_event): Fix prototype.
 
-        * macterm.c (XTread_socket):  Remove bufp_r and
+        * macterm.c (XTread_socket): Remove bufp_r and
         numcharsp args.  Add hold_quit arg.
         Rework to use just one, local, inev input_event. Store inev
         directly in fifo using kbd_buffer_store_event_hold.
@@ -51,7 +126,7 @@
         initialize local hold_quit event to handle postponed quit event
         (and store it if set by kbd_buffer_store_event_hold).
 
-        * term.c (read_socket_hook): Fix arg list. 
+        * term.c (read_socket_hook): Fix arg list.
 
         * termhooks.h (read_socket_hook): Fix prototype.
 
@@ -73,9 +148,9 @@
 
         * xsmfns.c (x_session_check_input): Remove numchars arg.
 
-        * xterm.c (x_focus_changed, x_detect_focus_change): Remove
-        numchars arg.  Always store event into bufp arg.  Return nothing.
-        Callers changed accordingly.
+        * xterm.c (x_focus_changed, x_detect_focus_change):
+        Remove numchars arg.  Always store event into bufp arg.
+        Return nothing.  Callers changed accordingly.
         (glyph_rect): Simplify.
         (STORE_KEYSYM_FOR_DEBUG): New macro.
         (SET_SAVED_MENU_EVENT): Use inev instead of bufp, etc.
@@ -106,15 +181,14 @@
         * xterm.h (x_session_check_input): Fix prototype.
 
 2004-02-26  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
-        
-        * s/darwin.h (LD_SWITCH_SYSTEM_TEMACS): Add `-framework
-        QuickTime'.
-        
+
+        * s/darwin.h (LD_SWITCH_SYSTEM_TEMACS): Add `-framework QuickTime'.
+
         * dispextern.h [MAC_OSX]: Do not include Carbon/Carbon.h (now in
         macgui.h).
-        
+
         * emacs.c (main) [HAVE_CARBON]: Call init_xfns.
-        
+
         * macgui.h [MAC_OSX]: Include Carbon/Carbon.h.
         (mktime, DEBUG, Z, free, malloc, realloc, max, min)
         (init_process) [MAC_OSX] : Avoid conflicts with Carbon/Carbon.h.
@@ -123,18 +197,16 @@
         (Bitmap): Remove typedef.
         (Pixmap): Change int to GWorldPtr.
 
-        * macmenu.c [MAC_OSX]: Do not include Carbon/Carbon.h (now in
-        macgui.h).
-        
-        * macterm.h [MAC_OSX]: Do not include Carbon/Carbon.h (now in
-        macgui.h).
-        (RED16_FROM_ULONG, GREEN16_FROM_ULONG, BLUE16_FROM_ULONG): New
-        #define to extract 16-bit depth color components from unsigned
+        * macmenu.c [MAC_OSX]: Don't include Carbon/Carbon.h (now in macgui.h).
+
+        * macterm.h [MAC_OSX]: Don't include Carbon/Carbon.h (now in macgui.h).
+        (RED16_FROM_ULONG, GREEN16_FROM_ULONG, BLUE16_FROM_ULONG):
+        New #define to extract 16-bit depth color components from unsigned
         long representation.
         (PIX_MASK_DRAW, PIX_MASK_RETAIN): New #define to represent pixel
         colors used for masks.
         (struct mac_display_info): Add color_p.  Remove n_cbits.
-        
+
         * macfns.c: Include sys/types.h and sys/stat.h.
         [MAC_OSX]: Do not include Carbon/Carbon.h (now in macgui.h).
         Include QuickTime/QuickTime.h.
@@ -145,11 +217,11 @@
         (ZPixmap): New #define for compatibility with xfns.c.
         (XGetImage, XPutPixel, XGetPixel, XDestroyImage)
         (x_create_x_image_and_pixmap, x_destroy_x_image, x_put_x_image)
-        (find_image_fsspec, image_load_qt_1, image_load_quicktime): New
-        functions.
+        (find_image_fsspec, image_load_qt_1, image_load_quicktime):
+        New functions.
         (four_corners_best, x_create_x_image_and_pixmap)
-        (x_destroy_x_image, unwind_create_frame, x_disable_image,
-        (x_edge_detection, init_color_table, colors_in_color_table,
+        (x_destroy_x_image, unwind_create_frame, x_disable_image)
+        (x_edge_detection, init_color_table, colors_in_color_table)
         (lookup_rgb_color, lookup_pixel_color, postprocess_image)
         (x_put_x_image, slurp_file, xbm_scan, xbm_load, xbm_load_image)
         (xbm_image_p, xbm_read_bitmap_data, xbm_file_p, x_to_xcolors)
@@ -168,14 +240,13 @@
         (enum pbm_keyword_index, pbm_format, enum png_keyword_index)
         (png_format, png_image_p, enum jpeg_keyword_index, jpeg_format)
         (jpeg_image_p, enum tiff_keyword_index, tiff_format, tiff_image_p)
-        (enum gif_keyword_index, gif_format, gif_image_p): Sync with
-        xfns.c.
+        (enum gif_keyword_index, gif_format, gif_image_p): Sync with xfns.c.
         (x_make_gc): Sync with xfns.c.  Enclose unused `border_tile' with
         #if 0.
         (x_free_gcs): Sync with xfns.c.  Enclose unused `border_tile' with
         #if 0.  Free white_relief.gc and black_relief.gc.
-        (unwind_create_frame, x_emboss, x_laplace, x_edge_detection): New
-        functions (from xfns.c).
+        (unwind_create_frame, x_emboss, x_laplace, x_edge_detection):
+        New functions (from xfns.c).
         (Fx_create_frame): Record unwind_create_frame.
         (Fxw_display_color_p): Use dpyinfo->color_p.
         (Fx_display_grayscale_p, Fx_display_planes): Don't use
@@ -187,14 +258,13 @@
         (Fimage_size, Fimage_mask_p, four_corners_best, image_background)
         (x_clear_image_1, postprocess_image, slurp_file, xbm_load_image)
         (xbm_file_p, x_to_xcolors, x_from_xcolors, x_detect_edges)
-        (image_background_transparent): New function (from xfns.c).  Use
-        PIX_MASK_DRAW/PIX_MASK_RETAIN.
+        (image_background_transparent): New function (from xfns.c).
+        Use PIX_MASK_DRAW/PIX_MASK_RETAIN.
         (image_load_quicktime): Add declaration.
         [MAC_OSX] (image_load_quartz2d): Likewise.
         [MAC_OSX] (CGImageCreateWithPNGDataProviderProcType): New typedef.
         [MAC_OSX] (MyCGImageCreateWithPNGDataProvider): New variable.
-        [MAC_OSX] (init_image_func_pointer, image_load_quartz2d): New
-        functions.
+        [MAC_OSX] (init_image_func_pointer, image_load_quartz2d): New funs.
         (xbm_load_image_from_file, x_laplace_read_row)
         (x_laplace_write_row, pbm_read_file): Remove functions.
         [HAVE_XPM] (enum xpm_keyword_index, xpm_format, xpm_image_p)
@@ -203,23 +273,22 @@
         (lookup_rgb_color): Don't lookup color table.  Just do gamma
         correction.
         (COLOR_INTENSITY): New #define (from xfns.c).
-        (x_disable_image): New function (from xfns.c).  Use
-        PIX_MASK_DRAW/PIX_MASK_RETAIN.
-        (x_build_heuristic_mask): Sync with xfns.c.  Use
-        PIX_MASK_DRAW/PIX_MASK_RETAIN.
+        (x_disable_image): New function (from xfns.c).
+        Use PIX_MASK_DRAW/PIX_MASK_RETAIN.
+        (x_build_heuristic_mask): Sync with xfns.c.
+        Use PIX_MASK_DRAW/PIX_MASK_RETAIN.
         (HAVE_PBM): Remove #ifdef.
         (pbm_load): Sync with xfns.c.  Set img->width and img->height
         before IMAGE_BACKGROUND.
-        (png_image_p, png_load): Don't enclose declarations with #if
-        HAVE_PNG.
+        (png_image_p, png_load): Don't enclose declarations with #if HAVE_PNG.
         (Qpng, enum png_keyword_index, png_format, png_type, png_image_p):
         Don't enclose with #if HAVE_PNG.
         [!HAVE_PNG] (png_load) [MAC_OSX]: Use image_load_quartz2d if a
-        symbol _CGImageCreateWithPNGDataProvider is defined.  Otherwise
-        use image_load_quicktime.
+        symbol _CGImageCreateWithPNGDataProvider is defined.
+        Otherwise use image_load_quicktime.
         [!HAVE_PNG] (png_load) [!MAC_OSX]: Use image_load_quicktime.
-        [HAVE_PNG] (png_load): Sync with xfns.c.  Use
-        PIX_MASK_DRAW/PIX_MASK_RETAIN.
+        [HAVE_PNG] (png_load): Sync with xfns.c.
+        Use PIX_MASK_DRAW/PIX_MASK_RETAIN.
         (jpeg_image_p, jpeg_load): Don't enclose declarations with #if
         HAVE_JPEG.
         (Qjpeg, enum jpeg_keyword_index, jpeg_format, jpeg_type)
@@ -232,11 +301,10 @@
         (Qtiff, enum tiff_keyword_index, tiff_format, tiff_type)
         (tiff_image_p): Don't enclose with #if HAVE_TIFF.
         [!HAVE_TIFF] (tiff_load): Use image_load_quicktime.
-        [HAVE_TIFF] (tiff_error_handler, tiff_warning_handler): New
-        functions (from xfns.c).
+        [HAVE_TIFF] (tiff_error_handler, tiff_warning_handler):
+        New functions (from xfns.c).
         [HAVE_TIFF] (tiff_load): Sync with xfns.c.
-        (gif_image_p, gif_load): Don't enclose declarations with #if
-        HAVE_GIF.
+        (gif_image_p, gif_load): Don't enclose declarations with #if HAVE_GIF.
         (Qgif, enum gif_keyword_index, gif_format, gif_type, gif_image_p):
         Don't enclose with #if HAVE_GIF.
         [!HAVE_GIF] (gif_load): Use Quicktime Movie Toolbox if it is
@@ -253,12 +321,11 @@
         image types.  Remove #if HAVE_JPEG, HAVE_TIFF, HAVE_GIF, and
         HAVE_PNG.  Add defsubr for Simage_size and Simage_mask_p.
         (init_xfns): Remove #if HAVE_JPEG, HAVE_TIFF, HAVE_GIF, and
-        HAVE_PNG.  Call EnterMovies to support animated gifs.  Call
-        init_image_func_pointer to bind a symbol
+        HAVE_PNG.  Call EnterMovies to support animated gifs.
+        Call init_image_func_pointer to bind a symbol
         _CGImageCreateWithPNGDataProvider if it is defined.
-        
-        * macterm.c [MAC_OSX]: Do not include Carbon/Carbon.h (now in
-        macgui.h).
+
+        * macterm.c [MAC_OSX]: Don't include Carbon/Carbon.h (now in macgui.h).
         (x_draw_bar_cursor): Sync declaration with xterm.c.
         (XFreePixmap, mac_draw_rectangle_to_pixmap, mac_copy_area)
         (mac_copy_area_to_pixmap): Implementation with GWorld (offscreen
@@ -266,16 +333,16 @@
         (mac_set_forecolor, mac_set_backcolor): Use RED16_FROM_ULONG etc.
         (mac_draw_line_to_pixmap, XCreatePixmap)
         (XCreatePixmapFromBitmapData, mac_fill_rectangle_to_pixmap)
-        (mac_copy_area_with_mask, mac_copy_area_with_mask_to_pixmap): New
-        functions.
-        (mac_draw_bitmap) [TARGET_API_MAC_CARBON]: Use
-        GetPortBitMapForCopyBits instead of the cast to Bitmap *.  Cast
-        bits to char *.
+        (mac_copy_area_with_mask, mac_copy_area_with_mask_to_pixmap):
+        New functions.
+        (mac_draw_bitmap) [TARGET_API_MAC_CARBON]:
+        Use GetPortBitMapForCopyBits instead of the cast to Bitmap *.
+        Cast bits to char *.
         (reflect_byte): New function (from w32fns.c).
         (mac_create_bitmap_from_bitmap_data): Use it and don't stuff bits
         due to byte alignment.
-        (mac_scroll_area) [TARGET_API_MAC_CARBON]: Use
-        GetPortBitMapForCopyBits instead of the cast to Bitmap *.
+        (mac_scroll_area) [TARGET_API_MAC_CARBON]:
+        Use GetPortBitMapForCopyBits instead of the cast to Bitmap *.
         (XSetForeground): Remove static (now used in macfns.c).
         (HIGHLIGHT_COLOR_DARK_BOOST_LIMIT): New #define (from w32term.c).
         (mac_alloc_lighter_color, x_destroy_window): Sync with w32term.c.
@@ -293,18 +360,16 @@
         (x_free_frame_resources): New funcion (from xterm.c).
         (XTread_socket): Call handle_tool_bar_click if mouse up/down event
         occurs in tool bar area.
-        (mac_initialize_display_info): Remove dpyinfo->n_cbits.  Set
-        dpyinfo->color_p.  Determine dpyinfo->n_planes using HasDepth.
+        (mac_initialize_display_info): Remove dpyinfo->n_cbits.
+        Set dpyinfo->color_p.  Determine dpyinfo->n_planes using HasDepth.
         Initialize image cache.
         (stricmp, wildstrieq, mac_font_pattern_match, mac_font_match):
         Enclose unused functions with #if 0.
         (Qbig5, Qcn_gb, Qsjis, Qeuc_kr): New variables.
         (decode_mac_font_name): New function to apply code conversions
-        from a mac font name to an XLFD font name according to its script
-        code.
+        from a mac font name to an XLFD font name according to its script code.
         (x_font_name_to_mac_font_name): Apply code conversion from an XLFD
-        font name to a mac font name according to REGISTRY and ENCODING
-        fields.
+        font name to a mac font name according to REGISTRY and ENCODING fields.
         (init_font_name_table) [TARGET_API_MAC_CARBON]: Don't use a font
         whose name starts with `.'.
         (init_font_name_table): Use decode_mac_font_name.  Add both
@@ -345,7 +410,7 @@
         * xfns.c (lookup_image): Remove xassert(!interrupt_input_blocked);
         BLOCK_INPUT can be nested, so it doesn't make much sense.
 
-2004-02-24  Michael Mauger <mmaug@yahoo.com>
+2004-02-24  Michael Mauger  <mmaug@yahoo.com>
 
         * w32fns.c (slurp_file, xbm_scan, xbm_load_image)
         (xbm_read_bitmap_data): Use unsigned char for image data.
@@ -363,8 +428,8 @@
 
         * emacs.c (USAGE1): Split into two halves.
         (USAGE2): Second half of the old USAGE1.
-        (USAGE3): Renamed from USAGE2.
-        (USAGE4): Renamed from USAGE3.
+        (USAGE3): Rename from USAGE2.
+        (USAGE4): Rename from USAGE3.
 
 2004-02-21  Juri Linkov  <juri@jurta.org>
 
@@ -387,8 +452,8 @@
         in one call to read_socket_hook.  Value is 8.
         (read_avail_input): Separate and rework handling of read_socket_hook
         and non-read_socket_hook cases.  Use smaller input_event buffer
-        in read_socket_hook case, and repeat if full buffer is read.  Use
-        new local variable 'discard' to skip input after C-g.
+        in read_socket_hook case, and repeat if full buffer is read.
+        Use new local variable 'discard' to skip input after C-g.
         In non-read_socket_hook case, just use a single input_event, and
         call kbd_buffer_store_event on the fly for each character.
 
@@ -595,7 +660,7 @@
         Add prototypes.
 
         * macterm.c (mac_draw_bitmap): Add overlay_p arg.
-        (x_draw_fringe_bitmap):  Handle overlayed fringe bitmaps;
+        (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps;
         thanks to YAMAMOTO Mitsuharu for advice on how to do this.
         Use cursor color for displaying cursor in fringe.
         (x_redisplay_interface): Add null handlers for
@@ -756,7 +821,7 @@
 
         * makefile.w32-in, w32fns.c: Add `default-printer-name' function.
 
-2004-01-27  Steven Tamm <steventamm@mac.com>
+2004-01-27  Steven Tamm  <steventamm@mac.com>
 
         * unexmacosx.c (unexec_copy): Do not copy more than was
         requested to prevent overwriting during unexec.
@@ -767,7 +832,7 @@
 
         * process.h: Add extern to synch_process_termsig.
 
-2004-01-27  Steven Tamm <steventamm@mac.com>
+2004-01-27  Steven Tamm  <steventamm@mac.com>
 
         * macterm.c (make_mac_frame, make_mac_terminal_frame):
         Move setting of scroll bars from make_mac_frame to
@@ -884,7 +949,7 @@
 
         * buffer.h (struct buffer): New member indicate_buffer_boundaries.
 
-        * buffer.c (init_buffer_once):  Set buffer_defaults and
+        * buffer.c (init_buffer_once): Set buffer_defaults and
         buffer_local_flags for indicate_buffer_boundaries.
         (syms_of_buffer): Defvar_per_buffer it, and defvar_lisp_nopro
         default- variable for it.
@@ -1095,7 +1160,7 @@
         to the definition of `signal' in the Elisp manual.
         * eval.c (Fsignal): Ditto.
 
-2003-12-29  James Clark <jjc@jclark.com>  (tiny change)
+2003-12-29  James Clark  <jjc@jclark.com>  (tiny change)
 
         * fns.c (internal_equal): Return t for two NaN arguments.
 
@@ -1221,7 +1286,7 @@
 
         * minibuf.c (Fcompleting_read): Undo previous change.
 
-2003-12-25  Lars Hansen <larsh@math.ku.dk>
+2003-12-25  Lars Hansen  <larsh@math.ku.dk>
 
         * dired.c (Fdirectory_files, Fdirectory_files_and_attributes):
         Arguments GCPRO'ed in call to file name handler.
@@ -1410,7 +1475,7 @@
         * xdisp.c (note_mode_line_or_margin_highlight): Adapt to new
         mode_line_string and marginal_area_string parameters.
 
-2003-11-22  Lars Hansen <larsh@math.ku.dk>
+2003-11-22  Lars Hansen  <larsh@math.ku.dk>
 
         * w32.c (struct the_group, getgrgid): Add.
         * mac.c (struct my_group, getgrgid): Add.
@@ -1504,7 +1569,7 @@
         * frame.c (store_frame_param):
         * fontset.c (Fset_fontset_font):
         * emacs.c (shut_down_emacs):
-        * ccl.c (ccl_driver):  Remove period at end of error message.
+        * ccl.c (ccl_driver): Remove period at end of error message.
 
         * config.in: Regenerate.
 
@@ -1809,7 +1874,7 @@
         Set BUF_INTERVALS (buffer)->up_obj when appropriate.
         Handle over_used when splitting UNDER.
 
-2003-09-30  YAMAMOTO  Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
+2003-09-30  YAMAMOTO  Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * regex.c (regex_compile): Free the stack when returning from function.
 
@@ -2064,7 +2129,7 @@
 
         * w32term.c (w32_read_socket): Fix WM_MOUSEWHEEL assignment.
 
-2003-08-26  Terje Rosten <terjeros@phys.ntnu.no>
+2003-08-26  Terje Rosten  <terjeros@phys.ntnu.no>
 
         * xfns.c (Vgtk_version_string): New variable.
         (syms_of_xfns): DEFVAR_LISP it.  Provide gtk.
@@ -3358,11 +3423,11 @@
         (draw_fringe_bitmap): Rework to handle per-window fringes and new
         fringe vs. display margin position.
         (hscroll_window_tree): Use window_box_width instead of window_box.
-        (redisplay_window):  Adapt to per-window scroll bars.
-        (draw_glyphs):  Rework to handle per-window fringes and scroll
+        (redisplay_window): Adapt to per-window scroll bars.
+        (draw_glyphs): Rework to handle per-window fringes and scroll
         bars, and new fringe vs. display margin position.
         Use WINDOW_LEFT_EDGE_X, WINDOW_TOTAL_WIDTH, and window_box_left.
-        (x_clear_end_of_line):  Adapt to per-window fringes and scroll
+        (x_clear_end_of_line): Adapt to per-window fringes and scroll
         bars, and new fringe vs. display margin position.  Fix bug which
         increased total width of full_width rows by width of scroll bars
         although window's total width already includes that.
@@ -4429,7 +4494,7 @@
         (w32_draw_window_cursor): New W32-specific functions for RIF.
         (w32_redisplay_interface): Add new members.
 
-        * w32gui.h (No_Cursor):  Define as 0 for W32.
+        * w32gui.h (No_Cursor): Define as 0 for W32.
         (XRectangle): Add X compatible rectangle type.
         (NativeRectangle): Declare as RECT for W32.
         (CONVERT_TO_XRECT, CONVERT_FROM_XRECT, STORE_NATIVE_RECT): New macros.
@@ -5517,7 +5582,7 @@
 
         * lisp.h: Declare Vx_resource_name extern.
 
-        * keyboard.c (kbd_buffer_get_event):  Check MENU_BAR_ACTIVATE_EVENT
+        * keyboard.c (kbd_buffer_get_event): Check MENU_BAR_ACTIVATE_EVENT
         for USE_GTK.
         (make_lispy_event): Check MENU_BAR_EVENT for USE_GTK.
 
@@ -5904,12 +5969,12 @@
         Its primary purpose at this time is to initialize the global variable
         track_mouse_event_fn.
 
-        * w32fns.c (w32_wnd_proc):  Remove initialization of
+        * w32fns.c (w32_wnd_proc): Remove initialization of
         track_mouse_event_fn from the handler for the WM_SETFOCUS message.
 
         * w32fns.c (syms_of_w32fns): Call globals_of_w32fns.
 
-        * w32menu.c (globals_of_w32menu):  New function. Used to
+        * w32menu.c (globals_of_w32menu): New function. Used to
         initialize those global variables that must always be initialized
         on startup even when the global variable initialized is non zero.
         Its primary purpose at this time is to initialize the global
@@ -11096,7 +11161,7 @@
 
 2001-12-03  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
-        * xdisp.c (syms_of_xdisp): Make `tool-bar-button-relief` an option.
+        * xdisp.c (syms_of_xdisp): Make `tool-bar-button-relief' an option.
 
 2001-12-02  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
diff --git a/src/buffer.c b/src/buffer.c
index ad1dde93da7..27b12845c50 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1675,8 +1675,9 @@ DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0,
        doc: /* Select buffer BUFFER in some window, preferably a different one.
 If BUFFER is nil, then some other buffer is chosen.
 If `pop-up-windows' is non-nil, windows can be split to do this.
-If optional second arg OTHER-WINDOW is non-nil, insist on finding another
-window even if BUFFER is already visible in the selected window.
+If optional second arg OTHER-WINDOW is nil, insist on finding another
+window even if BUFFER is already visible in the selected window,
+and ignore `same-window-regexps' and `same-window-buffer-names'.
 This uses the function `display-buffer' as a subroutine; see the documentation
 of `display-buffer' for additional customization information.
 
diff --git a/src/doc.c b/src/doc.c
index 0e22f6d1059..930afc88e23 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -821,7 +821,7 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
           start = strp;
           start_idx = start - SDATA (string);
 
-          while ((strp - SDATA (string) < SCHARS (string))
+          while ((strp - SDATA (string) < SBYTES (string))
                  && *strp != '}' && *strp != '>')
             strp++;
 
diff --git a/src/editfns.c b/src/editfns.c
index 9a1ce81f316..51435af0bb2 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1,5 +1,5 @@
 /* Lisp functions pertaining to editing.
-   Copyright (C) 1985,86,87,89,93,94,95,96,97,98, 1999, 2000, 2001, 02, 2003
+   Copyright (C) 1985,86,87,89,93,94,95,96,97,98,1999,2000,01,02,03,2004
         Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -2741,85 +2741,84 @@ DEFUN ("translate-region", Ftranslate_region, Stranslate_region, 3, 3, 0,
        doc: /* From START to END, translate characters according to TABLE.
 TABLE is a string; the Nth character in it is the mapping
 for the character with code N.
-This function does not alter multibyte characters.
 It returns the number of characters changed.  */)
      (start, end, table)
      Lisp_Object start;
      Lisp_Object end;
      register Lisp_Object table;
 {
-  register int pos_byte, stop;  /* Limits of the region. */
   register unsigned char *tt;   /* Trans table. */
   register int nc;              /* New character. */
   int cnt;                      /* Number of changes made. */
   int size;                     /* Size of translate table. */
-  int pos;
+  int pos, pos_byte;
   int multibyte = !NILP (current_buffer->enable_multibyte_characters);
+  int string_multibyte;
 
   validate_region (&start, &end);
   CHECK_STRING (table);
 
-  size = SBYTES (table);
+  if (multibyte != (SCHARS (table) < SBYTES (table)))
+    table = (multibyte
+             ? string_make_multibyte (table)
+             : string_make_unibyte (table));
+  string_multibyte = SCHARS (table) < SBYTES (table);
+
+  size = SCHARS (table);
   tt = SDATA (table);
 
-  pos_byte = CHAR_TO_BYTE (XINT (start));
-  stop = CHAR_TO_BYTE (XINT (end));
-  modify_region (current_buffer, XINT (start), XINT (end));
   pos = XINT (start);
+  pos_byte = CHAR_TO_BYTE (pos);
+  modify_region (current_buffer, pos, XINT (end));
 
   cnt = 0;
-  for (; pos_byte < stop; )
+  for (; pos < XINT (end); )
     {
       register unsigned char *p = BYTE_POS_ADDR (pos_byte);
-      int len;
+      unsigned char *str;
+      int len, str_len;
       int oc;
-      int pos_byte_next;
 
       if (multibyte)
-        oc = STRING_CHAR_AND_LENGTH (p, stop - pos_byte, len);
+        oc = STRING_CHAR_AND_LENGTH (p, MAX_MULTIBYTE_LENGTH, len);
       else
         oc = *p, len = 1;
-      pos_byte_next = pos_byte + len;
-      if (oc < size && len == 1)
+      if (oc < size)
         {
-          nc = tt[oc];
+          if (string_multibyte)
+            {
+              str = tt + string_char_to_byte (table, oc);
+              nc = STRING_CHAR_AND_LENGTH (str, MAX_MULTIBYTE_LENGTH, str_len);
+            }
+          else
+            {
+              str = tt + oc;
+              nc = tt[oc], str_len = 1;
+            }
           if (nc != oc)
             {
-              /* Take care of the case where the new character
-                 combines with neighboring bytes.  */
-              if (!ASCII_BYTE_P (nc)
-                  && (CHAR_HEAD_P (nc)
-                      ? ! CHAR_HEAD_P (FETCH_BYTE (pos_byte + 1))
-                      : (pos_byte > BEG_BYTE
-                         && ! ASCII_BYTE_P (FETCH_BYTE (pos_byte - 1)))))
+              if (len != str_len)
                 {
                   Lisp_Object string;
 
-                  string = make_multibyte_string (tt + oc, 1, 1);
                   /* This is less efficient, because it moves the gap,
-                     but it handles combining correctly.  */
-                  replace_range (pos, pos + 1, string,
-                                 1, 0, 1);
-                  pos_byte_next = CHAR_TO_BYTE (pos);
-                  if (pos_byte_next > pos_byte)
-                    /* Before combining happened.  We should not
-                       increment POS.  So, to cancel the later
-                       increment of POS, we decrease it now.  */
-                    pos--;
-                  else
-                    INC_POS (pos_byte_next);
+                     but it should multibyte characters correctly.  */
+                  string = make_multibyte_string (str, 1, str_len);
+                  replace_range (pos, pos + 1, string, 1, 0, 1);
+                  len = str_len;
                 }
               else
                 {
                   record_change (pos, 1);
-                  *p = nc;
+                  while (str_len-- > 0)
+                    *p++ = *str++;
                   signal_after_change (pos, 1, 1);
                   update_compositions (pos, pos + 1, CHECK_BORDER);
                 }
               ++cnt;
             }
         }
-      pos_byte = pos_byte_next;
+      pos_byte += len;
       pos++;
     }
 
diff --git a/src/fringe.c b/src/fringe.c
index b14668e8d7e..48a644707c6 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -637,7 +637,10 @@ draw_fringe_bitmap (w, row, left_p)
   draw_fringe_bitmap_1 (w, row, left_p, overlay, NO_FRINGE_BITMAP);
 
   if (left_p && row->overlay_arrow_p)
-    draw_fringe_bitmap_1 (w, row, 1, 1, OVERLAY_ARROW_BITMAP);
+    draw_fringe_bitmap_1 (w, row, 1, 1,
+                          (w->overlay_arrow_bitmap
+                           ? w->overlay_arrow_bitmap
+                           : OVERLAY_ARROW_BITMAP));
 }
 
 
@@ -738,7 +741,7 @@ update_window_fringes (w, force_p)
         {
           unsigned indicate_bob_p, indicate_top_line_p;
           unsigned indicate_eob_p, indicate_bottom_line_p;
-          
+
           row = w->desired_matrix->rows + rn;
           if (!row->enabled_p)
             row = w->current_matrix->rows + rn;
@@ -747,7 +750,7 @@ update_window_fringes (w, force_p)
           indicate_top_line_p = row->indicate_top_line_p;
           indicate_eob_p = row->indicate_eob_p;
           indicate_bottom_line_p = row->indicate_bottom_line_p;
-          
+
           row->indicate_bob_p = row->indicate_top_line_p = 0;
           row->indicate_eob_p = row->indicate_bottom_line_p = 0;
 
@@ -800,10 +803,6 @@ update_window_fringes (w, force_p)
           left = row->left_user_fringe_bitmap;
           left_face_id = row->left_user_fringe_face_id;
         }
-#if 0  /* this is now done via an overlay */
-      else if (row->overlay_arrow_p)
-        left = OVERLAY_ARROW_BITMAP;
-#endif
       else if (row->indicate_bob_p && boundary_pos <= 0)
         left = ((row->indicate_eob_p && boundary_pos < 0)
                 ? LEFT_BRACKET_BITMAP : TOP_LEFT_ANGLE_BITMAP);
@@ -882,7 +881,7 @@ update_window_fringes (w, force_p)
 }
 
 
-/* Compute actual fringe widths for frame F.  
+/* Compute actual fringe widths for frame F.
 
    If REDRAW is 1, redraw F if the fringe settings was actually
    modified and F is visible.
@@ -1099,7 +1098,7 @@ DEFUN ("define-fringe-bitmap", Fdefine_fringe_bitmap, Sdefine_fringe_bitmap,
 BITS is either a string or a vector of integers.
 HEIGHT is height of bitmap.  If HEIGHT is nil, use length of BITS.
 WIDTH must be an integer between 1 and 16, or nil which defaults to 8.
-Optional forth arg ALIGN may be one of `top', `center', or `bottom',
+Optional fourth arg ALIGN may be one of `top', `center', or `bottom',
 indicating the positioning of the bitmap relative to the rows where it
 is used; the default is to center the bitmap.  Fourth arg may also be a
 list (ALIGN PERIODIC) where PERIODIC non-nil specifies that the bitmap
@@ -1133,7 +1132,7 @@ Return new bitmap number, or nil of no more free bitmap slots.  */)
           fill2 = fb.height - h - fill1;
         }
     }
-  
+
   if (NILP (width))
     fb.width = 8;
   else
@@ -1220,7 +1219,7 @@ Return new bitmap number, or nil of no more free bitmap slots.  */)
 
 DEFUN ("set-fringe-bitmap-face", Fset_fringe_bitmap_face, Sset_fringe_bitmap_face,
        1, 2, 0,
-       doc:  /* Set face for fringe bitmap FRINGE-ID to FACE.
+       doc: /* Set face for fringe bitmap FRINGE-ID to FACE.
 If FACE is nil, reset face to default fringe face.  */)
   (fringe_id, face)
      Lisp_Object fringe_id, face;
@@ -1247,7 +1246,7 @@ If FACE is nil, reset face to default fringe face.  */)
 
 DEFUN ("fringe-bitmaps-at-pos", Ffringe_bitmaps_at_pos, Sfringe_bitmaps_at_pos,
        0, 2, 0,
-       doc:  /* Return fringe bitmaps of row containing position POS in window WINDOW.
+       doc: /* Return fringe bitmaps of row containing position POS in window WINDOW.
 If WINDOW is nil, use selected window.  If POS is nil, use value of point
 in that window.  Return value is a cons (LEFT . RIGHT) where LEFT and RIGHT
 are the fringe bitmap numbers for the bitmaps in the left and right fringe,
@@ -1349,7 +1348,7 @@ w32_reset_fringes ()
 {
   /* Destroy row bitmaps.  */
   int bt;
-  
+
   for (bt = NO_FRINGE_BITMAP + 1; bt < max_used_fringe_bitmap; bt++)
     rif->destroy_fringe_bitmap (bt);
 }
diff --git a/src/indent.c b/src/indent.c
index 1b3e5847510..32efcbd0cc7 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1199,7 +1199,6 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
     = (INTEGERP (current_buffer->selective_display)
        ? XINT (current_buffer->selective_display)
        : !NILP (current_buffer->selective_display) ? -1 : 0);
-  int prev_hpos = 0;
   int selective_rlen
     = (selective && dp && VECTORP (DISP_INVIS_VECTOR (dp))
        ? XVECTOR (DISP_INVIS_VECTOR (dp))->size : 0);
@@ -1227,6 +1226,8 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
   int wide_column_end_hpos = 0;
   int prev_pos;                 /* Previous buffer position.  */
   int prev_pos_byte;            /* Previous buffer position.  */
+  int prev_hpos = 0;
+  int prev_vpos = 0;
   int contin_hpos;              /* HPOS of last column of continued line.  */
   int prev_tab_offset;          /* Previous tab offset.  */
 
@@ -1275,6 +1276,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
                   pos = prev_pos;
                   pos_byte = prev_pos_byte;
                   hpos = prev_hpos;
+                  vpos = prev_vpos;
                   tab_offset = prev_tab_offset;
                 }
               break;
@@ -1384,6 +1386,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
                   if (pos >= next_boundary)
                     next_boundary = pos + 1;
                   prev_hpos = width;
+                  prev_vpos = vpos;
                   prev_tab_offset = tab_offset;
                 }
             }
@@ -1416,6 +1419,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
           pos = prev_pos;
           pos_byte = prev_pos_byte;
           hpos = prev_hpos;
+          vpos = prev_vpos;
           tab_offset = prev_tab_offset;
 
           /* NOTE on contin_hpos, hpos, and prev_hpos.
@@ -1436,10 +1440,6 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
               hpos = contin_hpos;
               vpos = vpos - 1;
             }
-          else if (c == '\n')
-            /* If previous character is NEWLINE,
-               set VPOS back to previous line */
-            vpos = vpos - 1;
           break;
         }
 
@@ -1457,6 +1457,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
               pos = prev_pos;
               pos_byte = prev_pos_byte;
               hpos = prev_hpos;
+              vpos = prev_vpos;
               tab_offset = prev_tab_offset;
             }
           break;
@@ -1465,6 +1466,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
         break;
 
       prev_hpos = hpos;
+      prev_vpos = vpos;
       prev_pos = pos;
       prev_pos_byte = pos_byte;
       wide_column_end_hpos = 0;
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 1007e3940b0..0c153b185d8 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -723,6 +723,21 @@ $(BLD)/frame.$(O) : \
         $(SRC)/w32term.h \
         $(SRC)/window.h
 
+$(BLD)/fringe.$(O) : \
+        $(SRC)/fringe.c \
+        $(EMACS_ROOT)/src/s/ms-w32.h \
+        $(EMACS_ROOT)/src/m/intel386.h \
+        $(EMACS_ROOT)/src/config.h \
+        $(SRC)/atimer.h \
+        $(SRC)/blockinput.h \
+        $(SRC)/buffer.h \
+        $(SRC)/dispextern.h \
+        $(SRC)/frame.h \
+        $(SRC)/systime.h \
+        $(SRC)/w32bdf.h \
+        $(SRC)/w32gui.h \
+        $(SRC)/window.h
+
 $(BLD)/gmalloc.$(O) : \
         $(SRC)/gmalloc.c \
         $(EMACS_ROOT)/src/s/ms-w32.h \
diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
index a43443e48c2..3ba9ed1f5bd 100644
--- a/src/s/sol2-6.h
+++ b/src/s/sol2-6.h
@@ -7,5 +7,10 @@
 #define UNEXEC unexsol.o
 #endif
 
+/* "Dennis McRitchie" <dmcr@Princeton.EDU> reported failures
+   with GNU ld without this.  */
+
+#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
+
 /* arch-tag: 71ea3857-89dc-4395-9623-77964e6ed3ca
    (do not change this comment) */
diff --git a/src/w32term.c b/src/w32term.c
index c59dabc27b0..41c188a2414 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4394,7 +4394,7 @@ w32_read_socket (sd, expected, hold_quit)
 
                 if (tool_bar_p
                     || (dpyinfo->w32_focus_frame
-                        && f == dpyinfo->w32_focus_frame))
+                        && f != dpyinfo->w32_focus_frame))
                   inev.kind = NO_EVENT;
               }
 
diff --git a/src/window.c b/src/window.c
index 7419239752a..0192aa4edf6 100644
--- a/src/window.c
+++ b/src/window.c
@@ -281,6 +281,7 @@ make_window ()
   p->fringes_outside_margins = Qnil;
   p->scroll_bar_width = Qnil;
   p->vertical_scroll_bar_type = Qt;
+  p->overlay_arrow_bitmap = 0;
 
   Vwindow_list = Qnil;
   return val;
@@ -3269,9 +3270,10 @@ Returns the window displaying BUFFER.
 If `display-buffer-reuse-frames' is non-nil, and another frame is currently
 displaying BUFFER, then simply raise that frame.
 
-The variables `special-display-buffer-names', `special-display-regexps',
-`same-window-buffer-names', and `same-window-regexps' customize how certain
-buffer names are handled.
+The variables `special-display-buffer-names',
+`special-display-regexps', `same-window-buffer-names', and
+`same-window-regexps' customize how certain buffer names are handled.
+The latter two take effect only if NOT-THIS-WINDOW is t.
 
 If optional argument FRAME is `visible', search all visible frames.
 If FRAME is 0, search all visible and iconified frames.
diff --git a/src/window.h b/src/window.h
index f45ca39bb93..ef81da43b4d 100644
--- a/src/window.h
+++ b/src/window.h
@@ -254,6 +254,9 @@ struct window
     /* This is handy for undrawing the cursor.  */
     int phys_cursor_ascent, phys_cursor_height;
 
+    /* Alternate overlay-arrow-bitmap in this window.  */
+    int overlay_arrow_bitmap;
+
     /* Non-zero means the cursor is currently displayed.  This can be
        set to zero by functions overpainting the cursor image.  */
     unsigned phys_cursor_on_p : 1;
diff --git a/src/xdisp.c b/src/xdisp.c
index 67f21446320..bb7ce740a63 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -403,6 +403,13 @@ int multiple_frames;
 
 Lisp_Object Vglobal_mode_string;
 
+
+/* List of variables (symbols) which hold markers for overlay arrows.
+   The symbols on this list are examined during redisplay to determine
+   where to display overlay arrows.  */ 
+
+Lisp_Object Voverlay_arrow_variable_list;
+
 /* Marker for where to display an arrow on top of the buffer text.  */
 
 Lisp_Object Voverlay_arrow_position;
@@ -411,11 +418,17 @@ Lisp_Object Voverlay_arrow_position;
 
 Lisp_Object Voverlay_arrow_string;
 
-/* Values of those variables at last redisplay.  However, if
-   Voverlay_arrow_position is a marker, last_arrow_position is its
+/* Values of those variables at last redisplay are stored as
+   properties on `overlay-arrow-position' symbol.  However, if
+   Voverlay_arrow_position is a marker, last-arrow-position is its
    numerical position.  */
 
-static Lisp_Object last_arrow_position, last_arrow_string;
+Lisp_Object Qlast_arrow_position, Qlast_arrow_string;
+
+/* Alternative overlay-arrow-string and overlay-arrow-bitmap
+   properties on a symbol in overlay-arrow-variable-list.  */
+
+Lisp_Object Qoverlay_arrow_string, Qoverlay_arrow_bitmap;
 
 /* Like mode-line-format, but for the title bar on a visible frame.  */
 
@@ -828,7 +841,8 @@ static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object,
 static int compute_window_start_on_continuation_line P_ ((struct window *));
 static Lisp_Object safe_eval_handler P_ ((Lisp_Object));
 static void insert_left_trunc_glyphs P_ ((struct it *));
-static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *));
+static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *,
+                                                          Lisp_Object));
 static void extend_face_to_end_of_line P_ ((struct it *));
 static int append_space P_ ((struct it *, int));
 static int make_cursor_line_fully_visible P_ ((struct window *));
@@ -9316,6 +9330,153 @@ redisplay ()
 }
 
 
+static Lisp_Object
+overlay_arrow_string_or_property (var, pbitmap)
+     Lisp_Object var;
+     int *pbitmap;
+{
+  Lisp_Object pstr = Fget (var, Qoverlay_arrow_string);
+  Lisp_Object bitmap;
+
+  if (pbitmap)
+    {
+      *pbitmap = 0;
+      if (bitmap  = Fget (var, Qoverlay_arrow_bitmap), INTEGERP (bitmap))
+        *pbitmap = XINT (bitmap);
+    }
+
+  if (!NILP (pstr))
+    return pstr;
+  return Voverlay_arrow_string;
+}
+
+/* Return 1 if there are any overlay-arrows in current_buffer.  */
+static int
+overlay_arrow_in_current_buffer_p ()
+{
+  Lisp_Object vlist;
+
+  for (vlist = Voverlay_arrow_variable_list;
+       CONSP (vlist);
+       vlist = XCDR (vlist))
+    {
+      Lisp_Object var = XCAR (vlist);
+      Lisp_Object val;
+
+      if (!SYMBOLP (var))
+        continue;
+      val = find_symbol_value (var);
+      if (MARKERP (val)
+          && current_buffer == XMARKER (val)->buffer)
+        return 1;
+    }
+  return 0;
+}
+
+
+/* Return 1 if any overlay_arrows have moved or overlay-arrow-string
+   has changed.  */
+
+static int
+overlay_arrows_changed_p ()
+{
+  Lisp_Object vlist;
+
+  for (vlist = Voverlay_arrow_variable_list;
+       CONSP (vlist);
+       vlist = XCDR (vlist))
+    {
+      Lisp_Object var = XCAR (vlist);
+      Lisp_Object val, pstr;
+
+      if (!SYMBOLP (var))
+        continue;
+      val = find_symbol_value (var);
+      if (!MARKERP (val))
+        continue;
+      if (! EQ (COERCE_MARKER (val),
+                Fget (var, Qlast_arrow_position))
+          || ! (pstr = overlay_arrow_string_or_property (var, 0),
+                EQ (pstr, Fget (var, Qlast_arrow_string))))
+        return 1;
+    }
+  return 0;
+}
+
+/* Mark overlay arrows to be updated on next redisplay.  */
+
+static void
+update_overlay_arrows (up_to_date)
+     int up_to_date;
+{
+  Lisp_Object vlist;
+
+  for (vlist = Voverlay_arrow_variable_list;
+       CONSP (vlist);
+       vlist = XCDR (vlist))
+    {
+      Lisp_Object var = XCAR (vlist);
+
+      if (!SYMBOLP (var))
+        continue;
+
+      if (up_to_date)
+        {
+          Lisp_Object val = find_symbol_value (var);
+          Fput (var, Qlast_arrow_position,
+                COERCE_MARKER (val));
+          Fput (var, Qlast_arrow_string,
+                overlay_arrow_string_or_property (var, 0));
+        }
+      else if (up_to_date < 0
+               || !NILP (Fget (var, Qlast_arrow_position)))
+        {
+          Fput (var, Qlast_arrow_position, Qt);
+          Fput (var, Qlast_arrow_string, Qt);
+        }
+    }
+}
+
+
+/* Return overlay arrow string at row, or nil.  */
+
+static Lisp_Object
+overlay_arrow_at_row (f, row, pbitmap)
+     struct frame *f;
+     struct glyph_row *row;
+     int *pbitmap;
+{
+  Lisp_Object vlist;
+
+  for (vlist = Voverlay_arrow_variable_list;
+       CONSP (vlist);
+       vlist = XCDR (vlist))
+    {
+      Lisp_Object var = XCAR (vlist);
+      Lisp_Object val;
+
+      if (!SYMBOLP (var))
+        continue;
+
+      val = find_symbol_value (var);
+      
+      if (MARKERP (val)
+          && current_buffer == XMARKER (val)->buffer
+          && (MATRIX_ROW_START_CHARPOS (row) == marker_position (val)))
+        {
+          val = overlay_arrow_string_or_property (var, pbitmap);
+          if (FRAME_WINDOW_P (f))
+            return Qt;
+          else if (STRINGP (val))
+            return val;
+          break;
+        }
+    }
+
+  *pbitmap = 0;
+  return Qnil;
+}
+
 /* Return 1 if point moved out of or into a composition.  Otherwise
    return 0.  PREV_BUF and PREV_PT are the last point buffer and
    position.  BUF and PT are the current point buffer and position.  */
@@ -9595,8 +9756,7 @@ redisplay_internal (preserve_echo_area)
 
   /* If specs for an arrow have changed, do thorough redisplay
      to ensure we remove any arrow that should no longer exist.  */
-  if (! EQ (COERCE_MARKER (Voverlay_arrow_position), last_arrow_position)
-      || ! EQ (Voverlay_arrow_string, last_arrow_string))
+  if (overlay_arrows_changed_p ())
     consider_all_windows_p = windows_or_buffers_changed = 1;
 
   /* Normally the message* functions will have already displayed and
@@ -10056,11 +10216,7 @@ redisplay_internal (preserve_echo_area)
       CHARPOS (this_line_start_pos) = 0;
 
       /* Let the overlay arrow be updated the next time.  */
-      if (!NILP (last_arrow_position))
-        {
-          last_arrow_position = Qt;
-          last_arrow_string = Qt;
-        }
+      update_overlay_arrows (0);
 
       /* If we pause after scrolling, some rows in the current
          matrices of some windows are not valid.  */
@@ -10076,8 +10232,8 @@ redisplay_internal (preserve_echo_area)
              consider_all_windows_p is set.  */
           mark_window_display_accurate_1 (w, 1);
 
-          last_arrow_position = COERCE_MARKER (Voverlay_arrow_position);
-          last_arrow_string = Voverlay_arrow_string;
+          /* Say overlay arrows are up to date.  */
+          update_overlay_arrows (1);
 
           if (FRAME_DISPLAY (sf)->frame_up_to_date_hook != 0)
             FRAME_DISPLAY (sf)->frame_up_to_date_hook (sf);
@@ -10273,16 +10429,14 @@ mark_window_display_accurate (window, accurate_p)
 
   if (accurate_p)
     {
-      last_arrow_position = COERCE_MARKER (Voverlay_arrow_position);
-      last_arrow_string = Voverlay_arrow_string;
+      update_overlay_arrows (1);
     }
   else
     {
       /* Force a thorough redisplay the next time by setting
          last_arrow_position and last_arrow_string to t, which is
          unequal to any useful value of Voverlay_arrow_...  */
-      last_arrow_position = Qt;
-      last_arrow_string = Qt;
+      update_overlay_arrows (-1);
     }
 }
 
@@ -11033,8 +11187,7 @@ try_cursor_movement (window, startp, scroll_step)
       && INTEGERP (w->window_end_vpos)
       && XFASTINT (w->window_end_vpos) < w->current_matrix->nrows
       && (FRAME_WINDOW_P (f)
-          || !MARKERP (Voverlay_arrow_position)
-          || current_buffer != XMARKER (Voverlay_arrow_position)->buffer))
+          || !overlay_arrow_in_current_buffer_p ()))
     {
       int this_scroll_margin;
       struct glyph_row *row = NULL;
@@ -12786,8 +12939,7 @@ try_window_id (w)
     GIVE_UP (10);
 
   /* Can use this if overlay arrow position and or string have changed.  */
-  if (!EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position))
-      || !EQ (last_arrow_string, Voverlay_arrow_string))
+  if (overlay_arrows_changed_p ())
     GIVE_UP (12);
 
 
@@ -13724,14 +13876,15 @@ usage: (trace-to-stderr STRING &rest OBJECTS)  */)
    arrow.  Only used for non-window-redisplay windows.  */
 
 static struct glyph_row *
-get_overlay_arrow_glyph_row (w)
+get_overlay_arrow_glyph_row (w, overlay_arrow_string)
      struct window *w;
+     Lisp_Object overlay_arrow_string;
 {
   struct frame *f = XFRAME (WINDOW_FRAME (w));
   struct buffer *buffer = XBUFFER (w->buffer);
   struct buffer *old = current_buffer;
-  const unsigned char *arrow_string = SDATA (Voverlay_arrow_string);
-  int arrow_len = SCHARS (Voverlay_arrow_string);
+  const unsigned char *arrow_string = SDATA (overlay_arrow_string);
+  int arrow_len = SCHARS (overlay_arrow_string);
   const unsigned char *arrow_end = arrow_string + arrow_len;
   const unsigned char *p;
   struct it it;
@@ -13758,7 +13911,7 @@ get_overlay_arrow_glyph_row (w)
 
       /* Get its face.  */
       ilisp = make_number (p - arrow_string);
-      face = Fget_text_property (ilisp, Qface, Voverlay_arrow_string);
+      face = Fget_text_property (ilisp, Qface, overlay_arrow_string);
       it.face_id = compute_char_face (f, it.c, face);
 
       /* Compute its width, get its glyphs.  */
@@ -14197,6 +14350,8 @@ display_line (it)
      struct it *it;
 {
   struct glyph_row *row = it->glyph_row;
+  int overlay_arrow_bitmap;
+  Lisp_Object overlay_arrow_string;
 
   /* We always start displaying at hpos zero even if hscrolled.  */
   xassert (it->hpos == 0 && it->current_x == 0);
@@ -14592,17 +14747,16 @@ display_line (it)
      mark this glyph row as the one containing the overlay arrow.
      This is clearly a mess with variable size fonts.  It would be
      better to let it be displayed like cursors under X.  */
-  if (MARKERP (Voverlay_arrow_position)
-      && current_buffer == XMARKER (Voverlay_arrow_position)->buffer
-      && (MATRIX_ROW_START_CHARPOS (row)
-          == marker_position (Voverlay_arrow_position))
-      && STRINGP (Voverlay_arrow_string)
-      && ! overlay_arrow_seen)
+  if (! overlay_arrow_seen
+      && (overlay_arrow_string
+            = overlay_arrow_at_row (it->f, row, &overlay_arrow_bitmap),
+          !NILP (overlay_arrow_string)))
     {
       /* Overlay arrow in window redisplay is a fringe bitmap.  */
       if (!FRAME_WINDOW_P (it->f))
         {
-          struct glyph_row *arrow_row = get_overlay_arrow_glyph_row (it->w);
+          struct glyph_row *arrow_row
+            = get_overlay_arrow_glyph_row (it->w, overlay_arrow_string);
           struct glyph *glyph = arrow_row->glyphs[TEXT_AREA];
           struct glyph *arrow_end = glyph + arrow_row->used[TEXT_AREA];
           struct glyph *p = row->glyphs[TEXT_AREA];
@@ -14626,6 +14780,7 @@ display_line (it)
         }
 
       overlay_arrow_seen = 1;
+      it->w->overlay_arrow_bitmap = overlay_arrow_bitmap;
       row->overlay_arrow_p = 1;
     }
 
@@ -17707,6 +17862,9 @@ produce_image_glyph (it)
   if (it->image_id < 0)
     {
       /* Fringe bitmap.  */
+      it->ascent = it->phys_ascent = 0;
+      it->descent = it->phys_descent = 0;
+      it->pixel_width = 0;
       it->nglyphs = 0;
       return;
     }
@@ -21433,10 +21591,15 @@ syms_of_xdisp ()
   list_of_error = Fcons (intern ("error"), Qnil);
   staticpro (&list_of_error);
 
-  last_arrow_position = Qnil;
-  last_arrow_string = Qnil;
-  staticpro (&last_arrow_position);
-  staticpro (&last_arrow_string);
+  Qlast_arrow_position = intern ("last-arrow-position");
+  staticpro (&Qlast_arrow_position);
+  Qlast_arrow_string = intern ("last-arrow-string");
+  staticpro (&Qlast_arrow_string);
+
+  Qoverlay_arrow_string = intern ("overlay-arrow-string");
+  staticpro (&Qoverlay_arrow_string);
+  Qoverlay_arrow_bitmap = intern ("overlay-arrow-bitmap");
+  staticpro (&Qoverlay_arrow_bitmap);
 
   echo_buffer[0] = echo_buffer[1] = Qnil;
   staticpro (&echo_buffer[0]);
@@ -21500,9 +21663,17 @@ See also `overlay-arrow-string'.  */);
   Voverlay_arrow_position = Qnil;
 
   DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string,
-    doc: /* String to display as an arrow.  See also `overlay-arrow-position'.  */);
+    doc: /* String to display as an arrow in non-window frames.
+See also `overlay-arrow-position'.  */);
   Voverlay_arrow_string = Qnil;
 
+  DEFVAR_LISP ("overlay-arrow-variable-list", &Voverlay_arrow_variable_list,
+    doc: /* List of variables (symbols) which hold markers for overlay arrows.
+The symbols on this list are examined during redisplay to determine
+where to display overlay arrows.  */);
+  Voverlay_arrow_variable_list
+    = Fcons (intern ("overlay-arrow-position"), Qnil);
+
   DEFVAR_INT ("scroll-step", &scroll_step,
     doc: /* *The number of lines to try scrolling a window by when point moves out.
 If that fails to bring point back on frame, point is centered instead.
diff --git a/src/xfns.c b/src/xfns.c
index 9f21cc98502..b2b16defdbd 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3762,8 +3762,17 @@ If omitted or nil, that stands for the selected frame's display.  */)
 {
   struct x_display_info *dpyinfo = check_x_display_info (display);
 
-  return make_number (DisplayCells (dpyinfo->display,
-                                    XScreenNumberOfScreen (dpyinfo->screen)));
+  int nr_planes = DisplayPlanes (dpyinfo->display,
+                                 XScreenNumberOfScreen (dpyinfo->screen));
+
+  /* Truncate nr_planes to 24 to avoid integer overflow.
+     Some displays says 32, but only 24 bits are actually significant.
+     There are only very few and rare video cards that have more than
+     24 significant bits.  Also 24 bits is more than 16 million colors,
+     it "should be enough for everyone".  */
+  if (nr_planes > 24) nr_planes = 24;
+
+  return make_number (1 << nr_planes);
 }
 
 DEFUN ("x-server-max-request-size", Fx_server_max_request_size,