Merged in changes from CVS trunk.

Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-694 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-695 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-696 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-697 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-698 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-699 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-700 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-701 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-702 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-703 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-704 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-705 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-706 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-707 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-708 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709 Update from CVS: src/indent.c (Fvertical_motion): Fix last change. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-710 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-711 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-712 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-713 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-72 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-73 Merge from emacs--cvs-trunk--0 git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-268
author: Karoly Lorentey 2004-11-22 11:06:39 +0000
committer: Karoly Lorentey 2004-11-22 11:06:39 +0000
commit: 71925ac335f7c3b1fd97fba98cb5b9b4f03a6e23 (patch)
tree: 63f61c3bebc83c114c16f31dd4ac2b9c0fe17c7d /src
parent: e417405015c93c81641f5c4a33ec898b5c353772 (diff)
parent: 83aebfe62204109f19ef7dcca5429c1ddad21c57 (diff)
download: emacs-71925ac335f7c3b1fd97fba98cb5b9b4f03a6e23.tar.gz
emacs-71925ac335f7c3b1fd97fba98cb5b9b4f03a6e23.zip
23 files changed, 906 insertions, 367 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cc9e71290d5..0d74afca197 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,226 @@
+2004-11-21  Kim F. Storm  <storm@cua.dk>
+        * xdisp.c (erase_phys_cursor): Clear hollow cursor inside TEXT_AREA.
+        * xterm.c (x_clip_to_row): Add area arg.  Callers changed.
+        (x_draw_hollow_cursor, x_draw_bar_cursor): Clip to TEXT_AREA.
+        * w32term.c (w32_clip_to_row): Add area arg.  Callers changed.
+        (x_draw_hollow_cursor, x_draw_bar_cursor): Clip to TEXT_AREA.
+        * macterm.c (x_clip_to_row): Add area arg.  Callers changed.
+        (x_draw_hollow_cursor, x_draw_bar_cursor): Clip to TEXT_AREA.
+        * xdisp.c (move_it_in_display_line_to, display_line): Restore
+        saved_face_id if overflow-newline-into-fringe is enabled and line
+        is continued before or in middle of element from display vector.
+        * indent.c (Fvertical_motion): Fix last change.  Use another
+        method to detect if iterator moved too far ahead after reseat.
+        * xdisp.c (IT_EXPAND_MATRIX_WIDTH): New macro.  Do not
+        expand matrix width for overflow in zero-width area.
+        (append_glyph, append_composite_glyph, produce_image_glyph)
+        (append_stretch_glyph): Use it to avoid loop in redisplay.
+        (note_mode_line_or_margin_highlight): Don't let help-echo from
+        string override help-echo from image map.
+2004-11-20  Luc Teirlinck  <teirllm@auburn.edu>
+        * fns.c (Fyes_or_no_p): Call Fread_from_minibuffer with extra
+        argument.
+        * callint.c (Fcall_interactively): Ditto.
+2004-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * minibuf.c (Fminibuffer_complete_and_exit):
+        Fixup the case of the completed value, for case-indep completion.
+2004-11-20  Richard M. Stallman  <rms@gnu.org>
+        * lisp.h (Fread_from_minibuffer): Add arg in decl.
+        * minibuf.c (read_minibuf): New arg KEEP_ALL.  Callers changed.
+        (Fread_from_minibuffer): New arg KEEP_ALL.  Callers changed.
+        * search.c (Vsearch_spaces_regexp):
+        Renamed from Vsearch_whitespace_regexp.  All uses changed.
+2004-11-20  Thien-Thi Nguyen  <ttn@gnu.org>
+        * eval.c (init_eval_once): Increase `max_specpdl_size' to 650.
+2004-11-19  Richard M. Stallman  <rms@gnu.org>
+        * search.c (Vsearch_whitespace_regexp): New variable.
+        (syms_of_search): Defvar it.
+        (compile_pattern_1): Call re_set_whitespace_regexp with it.
+        (search_buffer): No regexp is trivial if Vsearch_whitespace_regexp
+        is non-nil.
+        (struct regexp_cache): New element whitespace_regexp.
+        (syms_of_search): Initialize whitespace_regexp elements.
+        (compile_pattern): Compare whitespace_regexp elements.
+        (compile_pattern_1): Set whitespace_regexp elements.
+        * regex.c (regex_compile): Substitute whitespace_regexp
+        for spaces, if it is nonzero.
+        (whitespace_regexp): New variable.
+        (re_set_whitespace_regexp): New function.
+2004-11-19  Kim F. Storm  <storm@cua.dk>
+        * indent.c (Fvertical_motion): Fix last change.
+2004-11-18  Kim F. Storm  <storm@cua.dk>
+        * indent.c (Fvertical_motion): Undo 2004-11-16 change.
+        Instead, move back again if reseating moves too far ahead.
+2004-11-17  Luc Teirlinck  <teirllm@auburn.edu>
+        * xdisp.c (message3): Call clear_message.
+2004-11-17  Kim F. Storm  <storm@cua.dk>
+        * xdisp.c (erase_phys_cursor): Adjust cursor row visible height.
+2004-11-16  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+        * gtkutil.c (xg_get_file_name): Fix typo in
+        HAVE_GTK_FILE_SELECTION_NEW.
+        * xmenu.c (x_menu_in_use): Remove.
+        (x_menu_set_in_use): Also set popup_activated_flag.
+        * 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.
+2004-11-16  Richard M. Stallman  <rms@gnu.org>
+        * keymap.c (Fmap_keymap): New arg SORT-FIRST.
+        Use map-keymap-internal to implement that.
+        * indent.c (Fvertical_motion): In batch mode, use vmotion directly.
+2004-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * xdisp.c (get_glyph_string_clip_rect, init_glyph_string): Check it's
+        a window before using XWINDOW.
+        * window.c (make_window, Fselect_window, make_dummy_parent)
+        (save_window_save):
+        * frame.c (make_frame):
+        * fns.c (concat): Avoid side-effects inside XSETFASTINT's arguments.
+        * lisp.h (NILP): Use EQ rather than XFASTINT.
+2004-11-16  Kim F. Storm  <storm@cua.dk>
+        * fringe.c (Fdefine_fringe_bitmap): Always set 'h'.  Simplify.
+        * indent.c (Fvertical_motion): Fix last change.  Only reseat when
+        moving backwards.
+2004-11-16  Luc Teirlinck  <teirllm@auburn.edu>
+        * dispextern.h: Extern reseat_at_previous_visible_line_start.
+2004-11-16  Kenichi Handa  <handa@m17n.org>
+        * xdisp.c (display_mode_element): Fix previous change (calculate
+        end position of substring to display correctly).
+2004-11-16  Kim F. Storm  <storm@cua.dk>
+        * keyboard.c (Fposn_at_point): Remove extra */ after doc string.
+        Reported by Andrew M. Scott.
+2004-11-15  Kim F. Storm  <storm@cua.dk>
+        * fns.c (Fsafe_plist_get): New defun.
+        (syms_of_fns): Defsubr it.
+        * lisp.h (Fsafe_plist_get): Add EXFUN.
+        * xdisp.c (store_mode_line_string, produce_stretch_glyph):
+        Use Fsafe_plist_get.
+        (note_mode_line_or_margin_highlight, note_mouse_highlight):
+        Fix image map element parsing.  Use Fsafe_plist_get.
+2004-11-15  Richard M. Stallman  <rms@gnu.org>
+        * xdisp.c (get_next_display_element): Fix previous change.
+2004-11-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+        * window.c (shrink_windows): Handle special case of one window left
+        when trying to shrink the final reminder.  Grow windows if
+        total_removed is less than total_shrink.
+        * xmenu.c (pop_down_menu): Remove global variable current_menu,
+        extract pointer from arg with XSAVE_VALUE.
+        (create_and_show_popup_menu, create_and_show_dialog, xmenu_show):
+        Construct arg to record_unwind_protect with make_save_value.
+2004-11-13  Richard M. Stallman  <rms@gnu.org>
+        * xdisp.c (reseat_at_previous_visible_line_start): No longer static.
+        (get_next_display_element): Fix previous change to apply only to \n.
+        * indent.c (Fvertical_motion): Scan to PT from start of line to
+        make iterator consistent.
+        * minibuf.c (syms_of_minibuf) <completion-ignore-case>: Doc fix.
+2004-11-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+        * gtkutil.c (pop_down_file_dialog): Add BLOCK_INPUT.
+        * xfns.c (Fx_file_dialog): Call x_menu_in_use and x_menu_set_in_use.
+        Record unwind with clean_up_file_dialog.
+        * xterm.h (x_menu_in_use, x_menu_set_in_use, x_menu_wait_for_event):
+        Declare.
+        * xmenu.c (x_menu_in_use, x_menu_set_in_use): New functions.
+2004-11-13  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+        * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
+        (xg_file_sel_destroy): Remove.
+        (xg_file_response_cb, pop_down_file_dialog)
+        (xg_get_file_name_from_chooser, xg_get_file_name_from_selector):
+        New functions.
+        (xg_get_file_with_chooser, xg_get_file_with_selection):
+        Take new arg func, set it to xg_get_file_name_from_chooser/selector.
+        Move common code to xg_get_file_name.  Return widget created.
+        (xg_get_file_name): Set name, transient for, modal and destroy
+        with parent here.  Connect response signal to xg_file_response_cb,
+        connect delete-event to gtk_true.  Record pop_down_file_dialog
+        for unwind.  Do event loop and call x_menu_wait_for_event in loop.
+        (xg_create_widget): Make dialogs modal.
+        * xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
+        Lisp_Object.
+        (popup_get_selection): Move unwind protect ...
+        (create_and_show_popup_menu, create_and_show_dialog): ... to here.
+        Move destroy of widget to pop_down_menu.
+        (popup_widget_loop): Move unwind protect ...
+        (create_and_show_popup_menu, create_and_show_dialog): ... to here.
+        Move destroy of widget to pop_down_menu.
+        (pop_down_menu): BLOCK_INPUT and destroy widget/window.
+        (xmenu_show): Record unwind pop_down_menu.  Move XMenuDestroy,
+        x_mouse_leave and grabbed = 0 to pop_down_menu.
+2004-11-13  Kim F. Storm  <storm@cua.dk>
+        * xdisp.c (make_cursor_line_fully_visible_p): New variable.
+        (syms_of_xdisp): DEFVAR_BOOL it.
+        (make_cursor_line_fully_visible, try_cursor_movement)
+        (try_window_id): Use it.
 2004-11-12  Kim F. Storm  <storm@cua.dk>
        * dispextern.h (struct glyph_row): New member extra_line_spacing.
@@ -11,8 +234,8 @@
        (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
+        * window.c (window_scroll_pixel_based, Frecenter):
-        move_it_vertically_backward directly.
+        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
@@ -23,7 +246,7 @@
        (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.
+        (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.
@@ -115,7 +338,7 @@
        * 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
+        (mostlyclean): Rm buildobj.lst
        * makefile.w32-in ($(TEMACS)): Generate buildobj.lst when temacs
        is linked.
@@ -152,8 +375,8 @@
 2004-11-07  Andreas Schwab  <schwab@suse.de>
-        * lisp.h: Declare Fmsdos_downcase_filename.
+        * lisp.h (Fmsdos_downcase_filename): Declare.
-        * dired.c: Don't declare Fmsdos_downcase_filename.
+        * dired.c (Fmsdos_downcase_filename): Don't declare here.
        * fileio.c: Likewise.
 2004-11-07  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
@@ -164,7 +387,7 @@
        * msdos.c (IT_set_frame_parameters): Use EQ, not ==, for Lisp_Object:s.
-        * dired.c: extern declare Fmsdos_downcase_filename on MSDOS to avoid
+        * dired.c (Fmsdos_downcase_filename): Declare extern on MSDOS to avoid
        int/Lisp_Object mixup.
        * fileio.c: Ditto.
@@ -273,7 +496,7 @@
        * fileio.c (Fnext_read_file_uses_dialog_p): New function.
-        * gtkutil.h: Declare use_old_gtk_file_dialog.
+        * gtkutil.h (use_old_gtk_file_dialog): Declare.
        * gtkutil.c: Make use_old_gtk_file_dialog non-static.
        (xg_initialize): Move DEFVAR_BOOL for use_old_gtk_file_dialog ...
@@ -750,7 +973,6 @@
        precedence.
        (XTread_socket) [TARGET_API_MAC_CARBON]: Don't specify drag area.
 2004-10-05  Jan Dj,Ad(Brv.  <jan.h.d@swipnet.se>
        * config.in: Regenerate.
@@ -1327,7 +1549,7 @@
 2004-07-24  Richard M. Stallman  <rms@gnu.org>
-        * keyboard.h (not_single_kboard_state): Declared.
+        * keyboard.h (not_single_kboard_state): Declare.
        * fileio.c (Fwrite_region): Doc fix.
@@ -1535,7 +1757,7 @@
        (lookup_image_type): Pass Qnil as second argument to
        Finit_image_library.
-        * lisp.h: Declare Finit_image_library.
+        * lisp.h (Finit_image_library): Declare.
 2004-06-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
@@ -2380,7 +2602,7 @@
 2004-05-10  Andreas Schwab  <schwab@suse.de>
-        * lisp.h: Declare Fmake_symbolic_link.
+        * lisp.h (Fmake_symbolic_link): Declare.
        * fileio.c (Frename_file): Remove extra argument in call to
        Fmake_symbolic_link.
@@ -4871,9 +5093,9 @@
        (update_frame_tool_bar): Call xg_get_gdk_pixmap_and_mask.
        (xg_initialize): Remove xg_left_ptr_cursor.
-        * gtkutil.h: xg_get_scroll_id_for_window, xg_win_to_widget takes
+        * gtkutil.h (xg_get_scroll_id_for_window, xg_win_to_widget): Add
-        Display* argument also.  Declare xg_display_open,
+        Display* argument.
-        xg_display_close, xg_create_default_cursor.
+        (xg_display_open, xg_display_close, xg_create_default_cursor): Declare.
 2003-11-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
@@ -4939,8 +5161,8 @@
 2003-11-02  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
-        * gtkutil.h: Declare xg_have_tear_offs, remove xg_keep_popup
+        * gtkutil.h (xg_have_tear_offs): Declare.
-        and xg_did_tearoff.
+        (xg_keep_popup, xg_did_tearoff): Remove.
        * gtkutil.c: Remove variable xg_did_tearoff.
        (xg_have_tear_offs): New function.
@@ -5438,7 +5660,7 @@
        * alloc.c (lisp_align_malloc): Change type of `aligned'.
-        * alloca.s: Removed.
+        * alloca.s: Remove.
 2003-08-19  Gerd Moellmann  <gerd@gnu.org>
@@ -8060,7 +8282,7 @@
        (handle_one_xevent): ButtonPress/Release:  If event is for a toolkit
        scrollbar and control is pressed, call x_scroll_bar_handle_click.
-        * gtkutil.h: Declare xg_get_scroll_id_for_window.
+        * gtkutil.h (xg_get_scroll_id_for_window): Declare.
        * gtkutil.c (xg_get_scroll_id_for_window): New function.
        (xg_tool_bar_item_expose_callback): New function.
@@ -8762,7 +8984,7 @@
        (FRAME_OUTER_TO_INNER_DIFF_Y): Add FRAME_TOOLBAR_HEIGHT to calculation.
        * xterm.c: Include gtkutil.h for USE_GTK.
-        Declare extern void free_frame_menubar for USE_GTK.
+        (free_frame_menubar): Declare extern void for USE_GTK.
        (note_mouse_highlight): Check popup_activated for USE_GTK.
        (xt_action_hook): Don't compile if USE_GTK.
        (x_scroll_bar_to_input_event): Use CurrentTime for USE_GTK.
@@ -8832,7 +9054,7 @@
        (redisplay_window): Add check for USE_GTK and FRAME_EXTERNAL_TOOL_BAR.
        (display_menu_bar): Add check for USE_GTK
-        * lisp.h: Declare Vx_resource_name extern.
+        * lisp.h (Vx_resource_name): Declare extern.
        * keyboard.c (kbd_buffer_get_event): Check MENU_BAR_ACTIVATE_EVENT
        for USE_GTK.
@@ -9049,7 +9271,7 @@
        (XSAVE_VALUE): New macro.
        (struct Lisp_Save_Value): New data type.
        (union Lisp_Misc): Add u_save_value alternative.
-        (make_save_value): Declared.
+        (make_save_value): Declare.
        * alloc.c (make_save_value): New function.
@@ -12119,7 +12341,7 @@
        * fontset.c [MAC_OS]: Set Vdefault_fontset to ETL Fixed instead of
        Apple Monaco.
-        * process.c: Declare QCfamily and QCfilter as extern.
+        * process.c (QCfamily, QCfilte): Declare extern.
        (wait_reading_process_input) [MAC_OSX]: Clear bit for stdin before
        calling select.
@@ -12947,7 +13169,7 @@
 2002-03-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
-        * xterm.h (x_session_check_input, x_session_initialize): Declared.
+        * xterm.h (x_session_check_input, x_session_initialize): Declare.
        * xterm.c: (XTread_socket): Add call to x_session_check_input and
        x_session_have_connection.
@@ -12959,7 +13181,7 @@
        * emacs.c (main): Add call to syms_of_xsmfns.
-        * lisp.h: Declare syms_of_xsmfns as extern.
+        * lisp.h (syms_of_xsmfns): Declare extern.
        * config.in: Add HAVE_X_SM.
@@ -14304,7 +14526,7 @@
 2001-12-09  Jason Rumney  <jasonr@gnu.org>
        * w32menu.c (_widget_value): Make `help' field a Lisp_Object.
-        Add     comment to explain where the struct came from.
+        Add comment to explain where the struct came from.
        (single_submenu, w32_menu_show): Set `help' field as Lisp_Object.
        (add_menu_item): Process pop-up menus first to avoid memory leak.
        (add_menu_item, w32_menu_display_help): Use `help' field as
@@ -15090,7 +15312,7 @@
        * insdel.c (replace_range): Use adjust_markers_for_replace
        instead of adjust_markers_for_delete and adjust_markers_for_insert.
-        * intervals.h: Declare set_text_properties and set_text_properties_1.
+        * intervals.h (set_text_properties, set_text_properties_1): Declare.
        * textprop.c (set_text_properties_1): New subroutine
        broken out of set_text_properties.
diff --git a/src/callint.c b/src/callint.c
index bb71ad50f44..933601f67d0 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -723,7 +723,7 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used.  */)
                tem = Fread_from_minibuffer (build_string (callint_message),
                                             Qnil, Qnil, Qnil, Qnil, Qnil,
-                                             Qnil);
+                                             Qnil, Qnil);
                if (! STRINGP (tem) || SCHARS (tem) == 0)
                  args[i] = Qnil;
                else
diff --git a/src/dispextern.h b/src/dispextern.h
index a179c8488dd..d2ca9564ef8 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2594,6 +2594,7 @@ extern int help_echo_pos;
 extern struct frame *last_mouse_frame;
 extern int last_tool_bar_item;
 extern int mouse_autoselect_window;
+extern void reseat_at_previous_visible_line_start P_ ((struct it *));
 extern int calc_pixel_width_or_height P_ ((double *, struct it *, Lisp_Object,
                                           /* XFontStruct */ void *, int, int *));
diff --git a/src/eval.c b/src/eval.c
index d1d5d195762..adff3e8670c 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -204,7 +204,7 @@ init_eval_once ()
  specpdl_size = 50;
  specpdl = (struct specbinding *) xmalloc (specpdl_size * sizeof (struct specbinding));
  specpdl_ptr = specpdl;
-  max_specpdl_size = 600;
+  max_specpdl_size = 650;
  max_lisp_eval_depth = 300;
  Vrun_hooks = Qnil;
diff --git a/src/fns.c b/src/fns.c
index e0167ebf990..c436649f73d 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -741,7 +741,7 @@ concat (nargs, args, target_type, last_special)
                  }
                else
                  {
-                    XSETFASTINT (elt, SREF (this, thisindex++));
+                    XSETFASTINT (elt, SREF (this, thisindex)); thisindex++;
                    if (some_multibyte
                        && (XINT (elt) >= 0240
                            || (XINT (elt) >= 0200
@@ -1997,6 +1997,35 @@ one of the properties on the list.  */)
  return Qnil;
 }
+DEFUN ("safe-plist-get", Fsafe_plist_get, Ssafe_plist_get, 2, 2, 0,
+       doc: /* Extract a value from a property list.
+PLIST is a property list, which is a list of the form
+\(PROP1 VALUE1 PROP2 VALUE2...).  This function returns the value
+corresponding to the given PROP, or nil if PROP is not
+one of the properties on the list.
+This function never signals an error.  */)
+     (plist, prop)
+     Lisp_Object plist;
+     Lisp_Object prop;
+{
+  Lisp_Object tail, halftail;
+  /* halftail is used to detect circular lists.  */
+  tail = halftail = plist;
+  while (CONSP (tail) && CONSP (XCDR (tail)))
+    {
+      if (EQ (prop, XCAR (tail)))
+        return XCAR (XCDR (tail));
+      tail = XCDR (XCDR (tail));
+      halftail = XCDR (halftail);
+      if (EQ (tail, halftail))
+        break;
+    }
+  return Qnil;
+}
 DEFUN ("get", Fget, Sget, 2, 2, 0,
       doc: /* Return the value of SYMBOL's PROPNAME property.
 This is the last value stored with `(put SYMBOL PROPNAME VALUE)'.  */)
@@ -3275,7 +3304,7 @@ is nil, and `use-dialog-box' is non-nil.  */)
    {
      ans = Fdowncase (Fread_from_minibuffer (prompt, Qnil, Qnil, Qnil,
                                              Qyes_or_no_p_history, Qnil,
-                                              Qnil));
+                                              Qnil, Qnil));
      if (SCHARS (ans) == 3 && !strcmp (SDATA (ans), "yes"))
        {
          UNGCPRO;
@@ -5734,6 +5763,7 @@ used if both `use-dialog-box' and this variable are non-nil.  */);
  defsubr (&Sreverse);
  defsubr (&Ssort);
  defsubr (&Splist_get);
+  defsubr (&Ssafe_plist_get);
  defsubr (&Sget);
  defsubr (&Splist_put);
  defsubr (&Sput);
diff --git a/src/frame.c b/src/frame.c
index 80d1876ef11..660b9db4316 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -398,7 +398,8 @@ make_frame (mini_p)
  f->selected_window = root_window;
  /* Make sure this window seems more recently used than
     a newly-created, never-selected window.  */
-  XSETFASTINT (XWINDOW (f->selected_window)->use_time, ++window_select_count);
+  ++window_select_count;
+  XSETFASTINT (XWINDOW (f->selected_window)->use_time, window_select_count);
  f->default_face_done_p = 0;
diff --git a/src/fringe.c b/src/fringe.c
index 03abffab5c8..661af1fb0eb 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1210,7 +1210,6 @@ If BITMAP already exists, the existing definition is replaced.  */)
  (bitmap, bits, height, width, align)
     Lisp_Object bitmap, bits, height, width, align;
 {
-  Lisp_Object len;
  int n, h, i, j;
  unsigned short *b;
  struct fringe_bitmap fb, *xfb;
@@ -1218,20 +1217,21 @@ If BITMAP already exists, the existing definition is replaced.  */)
  CHECK_SYMBOL (bitmap);
-  if (!STRINGP (bits) && !VECTORP (bits))
+  if (STRINGP (bits))
-    bits = wrong_type_argument (Qstringp, bits);
+    h = SCHARS (bits);
+  else if (VECTORP (bits))
-  len = Flength (bits);
+    h = XVECTOR (bits)->size;
+  else
+    bits = wrong_type_argument (Qsequencep, bits);
  if (NILP (height))
-    h = fb.height = XINT (len);
+    fb.height = h;
  else
    {
      CHECK_NUMBER (height);
      fb.height = min (XINT (height), 255);
-      if (fb.height > XINT (len))
+      if (fb.height > h)
        {
-          h = XINT (len);
          fill1 = (fb.height - h) / 2;
          fill2 = fb.height - h - fill1;
        }
diff --git a/src/gtkutil.c b/src/gtkutil.c
index f5f05709e48..25dd88d544e 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1122,41 +1122,75 @@ create_dialog (wv, select_cb, deactivate_cb)
 /***********************************************************************
                      File dialog functions
 ***********************************************************************/
-enum
-{
-  XG_FILE_NOT_DONE,
-  XG_FILE_OK,
-  XG_FILE_CANCEL,
-  XG_FILE_DESTROYED,
-};
 #ifdef HAVE_GTK_FILE_BOTH
 int use_old_gtk_file_dialog;
 #endif
+/* Function that is called when the file dialog pops down.
+   W is the dialog widget, RESPONSE is the response code.
+   USER_DATA is what we passed in to g_signal_connect (pointer to int).  */
+static void
+xg_file_response_cb (w,
+                     response,
+                     user_data)
+     GtkDialog *w;
+     gint response;
+     gpointer user_data;
+{
+  int *ptr = (int *) user_data;
+  *ptr = response;
+}
+/*  Destroy the dialog.  This makes it pop down.  */
+static Lisp_Object
+pop_down_file_dialog (arg)
+     Lisp_Object arg;
+{
+  struct Lisp_Save_Value *p = XSAVE_VALUE (arg);
+  BLOCK_INPUT;
+  gtk_widget_destroy (GTK_WIDGET (p->pointer));
+  UNBLOCK_INPUT;
+  return Qnil;
+}
+typedef char * (*xg_get_file_func) P_ ((GtkWidget *));
 #ifdef HAVE_GTK_FILE_CHOOSER_DIALOG_NEW
+/* Return the selected file for file chooser dialog W.
+   The returned string must be free:d.  */
+static char *
+xg_get_file_name_from_chooser (w)
+     GtkWidget *w;
+{
+  return gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (w));
+}
 /* Read a file name from the user using a file chooser dialog.
   F is the current frame.
   PROMPT is a prompt to show to the user.  May not be NULL.
   DEFAULT_FILENAME is a default selection to be displayed.  May be NULL.
   If MUSTMATCH_P is non-zero, the returned file name must be an existing
-   file.
+   file.  *FUNC is set to a function that can be used to retrieve the
+   selected file name from the returned widget.
-   Returns a file name or NULL if no file was selected.
+   Returns the created widget.  */
-   The returned string must be freed by the caller.  */
-static char *
+static GtkWidget *
-xg_get_file_with_chooser (f, prompt, default_filename, mustmatch_p, only_dir_p)
+xg_get_file_with_chooser (f, prompt, default_filename,
+                          mustmatch_p, only_dir_p, func)
     FRAME_PTR f;
     char *prompt;
     char *default_filename;
     int mustmatch_p, only_dir_p;
+     xg_get_file_func *func;
 {
  GtkWidget *filewin;
  GtkWindow *gwin = GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f));
-  char *fn = 0;
  GtkFileChooserAction action = (mustmatch_p ?
                                 GTK_FILE_CHOOSER_ACTION_OPEN :
                                 GTK_FILE_CHOOSER_ACTION_SAVE);
@@ -1171,12 +1205,6 @@ xg_get_file_with_chooser (f, prompt, default_filename, mustmatch_p, only_dir_p)
                                         GTK_RESPONSE_OK,
                                         NULL);
-  xg_set_screen (filewin, f);
-  gtk_widget_set_name (filewin, "emacs-filedialog");
-  gtk_window_set_transient_for (GTK_WINDOW (filewin), gwin);
-  gtk_window_set_destroy_with_parent (GTK_WINDOW (filewin), TRUE);
  if (default_filename)
    {
      Lisp_Object file;
@@ -1197,104 +1225,49 @@ xg_get_file_with_chooser (f, prompt, default_filename, mustmatch_p, only_dir_p)
      UNGCPRO;
    }
-  gtk_widget_show (filewin);
+  *func = xg_get_file_name_from_chooser;
+  return filewin;
-  if (gtk_dialog_run (GTK_DIALOG (filewin)) == GTK_RESPONSE_OK)
-    fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filewin));
-  gtk_widget_destroy (filewin);
-  return fn;
 }
 #endif /* HAVE_GTK_FILE_CHOOSER_DIALOG_NEW */
 #ifdef HAVE_GTK_FILE_SELECTION_NEW
-/* Callback function invoked when the Ok button is pressed in
-   a file dialog.
-   W is the file dialog widget,
-   ARG points to an integer where we record what has happend.  */
-static void
+/* Return the selected file for file selector dialog W.
-xg_file_sel_ok (w, arg)
+   The returned string must be free:d.  */
-     GtkWidget *w;
-     gpointer arg;
-{
-  *(int*)arg = XG_FILE_OK;
-}
-/* Callback function invoked when the Cancel button is pressed in
+static char *
-   a file dialog.
+xg_get_file_name_from_selector (w)
-   W is the file dialog widget,
-   ARG points to an integer where we record what has happend.  */
-static void
-xg_file_sel_cancel (w, arg)
-     GtkWidget *w;
-     gpointer arg;
-{
-  *(int*)arg = XG_FILE_CANCEL;
-}
-/* Callback function invoked when the file dialog is destroyed (i.e.
-   popped down).  We must keep track of this, because if this
-   happens, GTK destroys the widget.  But if for example, Ok is pressed,
-   the dialog is popped down, but the dialog widget is not destroyed.
-   W is the file dialog widget,
-   ARG points to an integer where we record what has happend.  */
-static void
-xg_file_sel_destroy (w, arg)
     GtkWidget *w;
-     gpointer arg;
 {
-  *(int*)arg = XG_FILE_DESTROYED;
+  GtkFileSelection *filesel = GTK_FILE_SELECTION (w);
+  return xstrdup ((char*) gtk_file_selection_get_filename (filesel));
 }
-/* Read a file name from the user using a file selection dialog.
+/* Create a file selection dialog.
   F is the current frame.
   PROMPT is a prompt to show to the user.  May not be NULL.
   DEFAULT_FILENAME is a default selection to be displayed.  May be NULL.
   If MUSTMATCH_P is non-zero, the returned file name must be an existing
-   file.
+   file.  *FUNC is set to a function that can be used to retrieve the
+   selected file name from the returned widget.
-   Returns a file name or NULL if no file was selected.
+   Returns the created widget.  */
-   The returned string must be freed by the caller.  */
-static char *
+static GtkWidget *
 xg_get_file_with_selection (f, prompt, default_filename,
-                            mustmatch_p, only_dir_p)
+                            mustmatch_p, only_dir_p, func)
     FRAME_PTR f;
     char *prompt;
     char *default_filename;
     int mustmatch_p, only_dir_p;
+     xg_get_file_func *func;
 {
  GtkWidget *filewin;
  GtkFileSelection *filesel;
-  int filesel_done = XG_FILE_NOT_DONE;
-  char *fn = 0;
  filewin = gtk_file_selection_new (prompt);
  filesel = GTK_FILE_SELECTION (filewin);
-  xg_set_screen (filewin, f);
-  gtk_widget_set_name (filewin, "emacs-filedialog");
-  gtk_window_set_transient_for (GTK_WINDOW (filewin),
-                                GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)));
-  gtk_window_set_destroy_with_parent (GTK_WINDOW (filewin), TRUE);
-  g_signal_connect (G_OBJECT (filesel->ok_button),
-                    "clicked",
-                    G_CALLBACK (xg_file_sel_ok),
-                    &filesel_done);
-  g_signal_connect (G_OBJECT (filesel->cancel_button),
-                    "clicked",
-                    G_CALLBACK (xg_file_sel_cancel),
-                    &filesel_done);
-  g_signal_connect (G_OBJECT (filesel),
-                    "destroy",
-                    G_CALLBACK (xg_file_sel_destroy),
-                    &filesel_done);
  if (default_filename)
    gtk_file_selection_set_filename (filesel, default_filename);
@@ -1305,19 +1278,9 @@ xg_get_file_with_selection (f, prompt, default_filename,
      gtk_file_selection_hide_fileop_buttons (filesel);
    }
+  *func = xg_get_file_name_from_selector;
-  gtk_widget_show_all (filewin);
+  return filewin;
-  while (filesel_done == XG_FILE_NOT_DONE)
-    gtk_main_iteration ();
-  if (filesel_done == XG_FILE_OK)
-    fn = xstrdup ((char*) gtk_file_selection_get_filename (filesel));
-  if (filesel_done != XG_FILE_DESTROYED)
-    gtk_widget_destroy (filewin);
-  return fn;
 }
 #endif /* HAVE_GTK_FILE_SELECTION_NEW */
@@ -1341,26 +1304,63 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p)
     char *default_filename;
     int mustmatch_p, only_dir_p;
 {
+  GtkWidget *w = 0;
+  int count = SPECPDL_INDEX ();
+  char *fn = 0;
+  int filesel_done = 0;
+  xg_get_file_func func;
 #ifdef HAVE_GTK_FILE_BOTH
  if (use_old_gtk_file_dialog)
-    return xg_get_file_with_selection (f, prompt, default_filename,
+    w = xg_get_file_with_selection (f, prompt, default_filename,
-                                       mustmatch_p, only_dir_p);
+                                    mustmatch_p, only_dir_p, &func);
-  return xg_get_file_with_chooser (f, prompt, default_filename,
+  else
-                                   mustmatch_p, only_dir_p);
+    w = xg_get_file_with_chooser (f, prompt, default_filename,
+                                  mustmatch_p, only_dir_p, &func);
 #else /* not HAVE_GTK_FILE_BOTH */
-#ifdef HAVE_GTK_FILE_SELECTION_DIALOG_NEW
+#ifdef HAVE_GTK_FILE_SELECTION_NEW
-  return xg_get_file_with_selection (f, prompt, default_filename,
+  w = xg_get_file_with_selection (f, prompt, default_filename,
-                                     mustmatch_p, only_dir_p);
+                                  mustmatch_p, only_dir_p, &func);
 #endif
 #ifdef HAVE_GTK_FILE_CHOOSER_DIALOG_NEW
-  return xg_get_file_with_chooser (f, prompt, default_filename,
+  w = xg_get_file_with_chooser (f, prompt, default_filename,
-                                   mustmatch_p, only_dir_p);
+                                mustmatch_p, only_dir_p, &func);
 #endif
 #endif /* HAVE_GTK_FILE_BOTH */
-  return 0;
+  xg_set_screen (w, f);
+  gtk_widget_set_name (w, "emacs-filedialog");
+  gtk_window_set_transient_for (GTK_WINDOW (w),
+                                GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)));
+  gtk_window_set_destroy_with_parent (GTK_WINDOW (w), TRUE);
+  gtk_window_set_modal (GTK_WINDOW (w), TRUE);
+  g_signal_connect (G_OBJECT (w),
+                    "response",
+                    G_CALLBACK (xg_file_response_cb),
+                    &filesel_done);
+  /* Don't destroy the widget if closed by the window manager close button.  */
+  g_signal_connect (G_OBJECT (w), "delete-event", G_CALLBACK (gtk_true), NULL);
+  gtk_widget_show (w);
+  record_unwind_protect (pop_down_file_dialog, make_save_value (w, 0));
+  while (! filesel_done)
+    {
+      x_menu_wait_for_event (0);
+      gtk_main_iteration ();
+    }
+  if (filesel_done == GTK_RESPONSE_OK)
+    fn = (*func) (w);
+  unbind_to (count, Qnil);
+  return fn;
 }
@@ -1999,6 +1999,7 @@ xg_create_widget (type, name, f, val,
                                    GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)));
      gtk_window_set_destroy_with_parent (GTK_WINDOW (w), TRUE);
      gtk_widget_set_name (w, "emacs-dialog");
+      gtk_window_set_modal (GTK_WINDOW (w), TRUE);
    }
  else if (menu_bar_p || pop_up_p)
    {
diff --git a/src/indent.c b/src/indent.c
index 99fca1c2ff7..d2e8a83c11c 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2063,21 +2063,41 @@ whether or not it is currently displayed in some window.  */)
      XSETBUFFER (w->buffer, current_buffer);
    }
-  SET_TEXT_POS (pt, PT, PT_BYTE);
+  if (noninteractive)
-  start_display (&it, w, pt);
+    {
+      struct position pos;
-  /* Move to the start of the display line containing PT.  If we don't
+      pos = *vmotion (PT, XINT (lines), w);
-     do this, we start moving with IT->current_x == 0, while PT is
+      SET_PT_BOTH (pos.bufpos, pos.bytepos);
-     really at some x > 0.  The effect is, in continuation lines, that
+    }
-     we end up with the iterator placed at where it thinks X is 0,
+  else
-     while the end position is really at some X > 0, the same X that
+    {
-     PT had.  */
+      int it_start;
-  move_it_by_lines (&it, 0, 0);
+      SET_TEXT_POS (pt, PT, PT_BYTE);
-  if (XINT (lines) != 0)
+      start_display (&it, w, pt);
-    move_it_by_lines (&it, XINT (lines), 0);
+      /* Scan from the start of the line containing PT.  If we don't
-  SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
+         do this, we start moving with IT->current_x == 0, while PT is
+         really at some x > 0.  The effect is, in continuation lines, that
+         we end up with the iterator placed at where it thinks X is 0,
+         while the end position is really at some X > 0, the same X that
+         PT had.  */
+      it_start = IT_CHARPOS (it);
+      reseat_at_previous_visible_line_start (&it);
+      it.current_x = it.hpos = 0;
+      move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
+      /* Move back if we got too far.  This may happen if
+         truncate-lines is on and PT is beyond right margin.  */
+      if (IT_CHARPOS (it) > it_start && XINT (lines) > 0)
+        move_it_by_lines (&it, -1, 0);
+      it.vpos = 0;
+      if (XINT (lines) != 0)
+        move_it_by_lines (&it, XINT (lines), 0);
+      SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
+    }
  if (BUFFERP (old_buffer))
    w->buffer = old_buffer;
diff --git a/src/keyboard.c b/src/keyboard.c
index b520d655fb9..8501fc3f11a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10655,7 +10655,7 @@ a mouse click at the upper left corner of the glyph corresponding
 to the given buffer position:
   (WINDOW AREA-OR-POS (X . Y) TIMESTAMP OBJECT POS (COL . ROW)
    IMAGE (DX . DY) (WIDTH . HEIGHT))
-The `posn-' functions access elements of such lists.  */*/)
+The `posn-' functions access elements of such lists.  */)
  (pos, window)
     Lisp_Object pos, window;
 {
diff --git a/src/keymap.c b/src/keymap.c
index 891e41f0b58..a5e5fbd3f93 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -729,19 +729,23 @@ map_keymap_call (key, val, fun, dummy)
  call2 (fun, key, val);
 }
-DEFUN ("map-keymap", Fmap_keymap, Smap_keymap, 2, 2, 0,
+DEFUN ("map-keymap", Fmap_keymap, Smap_keymap, 2, 3, 0,
       doc: /* Call FUNCTION for every binding in KEYMAP.
 FUNCTION is called with two arguments: the event and its binding.
 If KEYMAP has a parent, the parent's bindings are included as well.
 This works recursively: if the parent has itself a parent, then the
-grandparent's bindings are also included and so on.  */)
+grandparent's bindings are also included and so on.
-     (function, keymap)
+usage: (map-keymap FUNCTION KEYMAP)  */)
-     Lisp_Object function, keymap;
+     (function, keymap, sort_first)
+     Lisp_Object function, keymap, sort_first;
 {
  if (INTEGERP (function))
    /* We have to stop integers early since map_keymap gives them special
       significance.  */
    Fsignal (Qinvalid_function, Fcons (function, Qnil));
+  if (! NILP (sort_first))
+    return call3 (intern ("map-keymap-internal"), function, keymap, Qt);
+      
  map_keymap (keymap, map_keymap_call, function, NULL, 1);
  return Qnil;
 }
diff --git a/src/lisp.h b/src/lisp.h
index 2c3141733bc..e54c8571fd5 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1374,7 +1374,7 @@ typedef unsigned char UCHAR;
 /* Data type checking */
-#define NILP(x)  (XFASTINT (x) == XFASTINT (Qnil))
+#define NILP(x)  EQ (x, Qnil)
 #define GC_NILP(x) GC_EQ (x, Qnil)
 #define NUMBERP(x) (INTEGERP (x) || FLOATP (x))
@@ -2304,6 +2304,7 @@ extern Lisp_Object string_make_multibyte P_ ((Lisp_Object));
 extern Lisp_Object string_make_unibyte P_ ((Lisp_Object));
 EXFUN (Fcopy_alist, 1);
 EXFUN (Fplist_get, 2);
+EXFUN (Fsafe_plist_get, 2);
 EXFUN (Fplist_put, 3);
 EXFUN (Fplist_member, 2);
 EXFUN (Fset_char_table_parent, 2);
@@ -2807,7 +2808,7 @@ extern void syms_of_search P_ ((void));
 extern Lisp_Object last_minibuf_string;
 extern void choose_minibuf_frame P_ ((void));
 EXFUN (Fcompleting_read, 8);
-EXFUN (Fread_from_minibuffer, 7);
+EXFUN (Fread_from_minibuffer, 8);
 EXFUN (Fread_variable, 2);
 EXFUN (Fread_buffer, 3);
 EXFUN (Fread_minibuffer, 2);
diff --git a/src/macterm.c b/src/macterm.c
index cdc1ccf41e3..8e3f67116f5 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -279,7 +279,7 @@ static void x_draw_hollow_cursor P_ ((struct window *, struct glyph_row *));
 static void x_draw_bar_cursor P_ ((struct window *, struct glyph_row *, int,
                                   enum text_cursor_kinds));
-static void x_clip_to_row P_ ((struct window *, struct glyph_row *, GC));
+static void x_clip_to_row P_ ((struct window *, struct glyph_row *, int, GC));
 static void x_flush P_ ((struct frame *f));
 static void x_update_begin P_ ((struct frame *));
 static void x_update_window_begin P_ ((struct window *));
@@ -1454,12 +1454,12 @@ x_draw_fringe_bitmap (w, row, p)
      int oldVH = row->visible_height;
      row->visible_height = p->h;
      row->y -= rowY - p->y;
-      x_clip_to_row (w, row, gc);
+      x_clip_to_row (w, row, -1, gc);
      row->y = oldY;
      row->visible_height = oldVH;
    }
  else
-    x_clip_to_row (w, row, gc);
+    x_clip_to_row (w, row, -1, gc);
  if (p->bx >= 0 && !p->overlay_p)
    {
@@ -4615,18 +4615,19 @@ x_scroll_bar_report_motion (fp, bar_window, part, x, y, time)
   mode lines must be clipped to the whole window.  */
 static void
-x_clip_to_row (w, row, gc)
+x_clip_to_row (w, row, area, gc)
     struct window *w;
     struct glyph_row *row;
+     int area;
     GC gc;
 {
  struct frame *f = XFRAME (WINDOW_FRAME (w));
  Rect clip_rect;
-  int window_y, window_width;
+  int window_x, window_y, window_width;
-  window_box (w, -1, 0, &window_y, &window_width, 0);
+  window_box (w, area, &window_x, &window_y, &window_width, 0);
-  clip_rect.left = WINDOW_TO_FRAME_PIXEL_X (w, 0);
+  clip_rect.left = window_x;
  clip_rect.top = WINDOW_TO_FRAME_PIXEL_Y (w, row->y);
  clip_rect.top = max (clip_rect.top, window_y);
  clip_rect.right = clip_rect.left + window_width;
@@ -4692,7 +4693,7 @@ x_draw_hollow_cursor (w, row)
  gc = dpyinfo->scratch_cursor_gc;
  /* Set clipping, draw the rectangle, and reset clipping again.  */
-  x_clip_to_row (w, row, gc);
+  x_clip_to_row (w, row, TEXT_AREA, gc);
  mac_draw_rectangle (dpy, FRAME_MAC_WINDOW (f), gc, x, y, wd, h);
  mac_reset_clipping (dpy, FRAME_MAC_WINDOW (f));
 }
@@ -4763,7 +4764,7 @@ x_draw_bar_cursor (w, row, width, kind)
      width = min (cursor_glyph->pixel_width, width);
      w->phys_cursor_width = width;
-      x_clip_to_row (w, row, gc);
+      x_clip_to_row (w, row, TEXT_AREA, gc);
      if (kind == BAR_CURSOR)
        XFillRectangle (dpy, window, gc,
diff --git a/src/minibuf.c b/src/minibuf.c
index a569daaefee..2ebb736ca00 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -219,7 +219,7 @@ static Lisp_Object read_minibuf P_ ((Lisp_Object, Lisp_Object,
                                     Lisp_Object, Lisp_Object,
                                     int, Lisp_Object,
                                     Lisp_Object, Lisp_Object,
-                                     int, int));
+                                     int, int, int));
 static Lisp_Object read_minibuf_noninteractive P_ ((Lisp_Object, Lisp_Object,
                                                    Lisp_Object, Lisp_Object,
                                                    int, Lisp_Object,
@@ -438,7 +438,8 @@ minibuffer_completion_contents ()
 static Lisp_Object
 read_minibuf (map, initial, prompt, backup_n, expflag,
-              histvar, histpos, defalt, allow_props, inherit_input_method)
+              histvar, histpos, defalt, allow_props, inherit_input_method,
+              keep_all)
     Lisp_Object map;
     Lisp_Object initial;
     Lisp_Object prompt;
@@ -449,6 +450,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
     Lisp_Object defalt;
     int allow_props;
     int inherit_input_method;
+     int keep_all;
 {
  Lisp_Object val;
  int count = SPECPDL_INDEX ();
@@ -727,7 +729,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
  last_minibuf_string = val;
  /* Choose the string to add to the history.  */
-  if (SCHARS (val) != 0)
+  if (SCHARS (val) != 0 || keep_all)
    histstring = val;
  else if (STRINGP (defalt))
    histstring = defalt;
@@ -754,7 +756,8 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
      if (NILP (histval)
          || (CONSP (histval)
              /* Don't duplicate the most recent entry in the history.  */
-              && NILP (Fequal (histstring, Fcar (histval)))))
+              && (keep_all
+                  || NILP (Fequal (histstring, Fcar (histval))))))
        {
          Lisp_Object length;
@@ -916,7 +919,7 @@ read_minibuf_unwind (data)
 }
-DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 7, 0,
+DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 8, 0,
       doc: /* Read a string from the minibuffer, prompting with string PROMPT.
 The optional second arg INITIAL-CONTENTS is an obsolete alternative to
  DEFAULT-VALUE.  It normally should be nil in new code, except when
@@ -940,6 +943,8 @@ Sixth arg DEFAULT-VALUE is the default value.  If non-nil, it is available
  the empty string.
 Seventh arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits
 the current input method and the setting of `enable-multibyte-characters'.
+Eight arg KEEP-ALL, if non-nil, says to put all inputs in the history list,
+ even empty or duplicate inputs.
 If the variable `minibuffer-allow-text-properties' is non-nil,
 then the string which is returned includes whatever text properties
 were present in the minibuffer.  Otherwise the value has no text properties.
@@ -955,9 +960,9 @@ POSITION in the minibuffer.  Any integer value less than or equal to
 one puts point at the beginning of the string.  *Note* that this
 behavior differs from the way such arguments are used in `completing-read'
 and some related functions, which use zero-indexing for POSITION.  */)
-     (prompt, initial_contents, keymap, read, hist, default_value, inherit_input_method)
+  (prompt, initial_contents, keymap, read, hist, default_value, inherit_input_method, keep_all)
     Lisp_Object prompt, initial_contents, keymap, read, hist, default_value;
-     Lisp_Object inherit_input_method;
+     Lisp_Object inherit_input_method, keep_all;
 {
  Lisp_Object histvar, histpos, val;
  struct gcpro gcpro1;
@@ -988,7 +993,8 @@ and some related functions, which use zero-indexing for POSITION.  */)
                      Qnil, !NILP (read),
                      histvar, histpos, default_value,
                      minibuffer_allow_text_properties,
-                      !NILP (inherit_input_method));
+                      !NILP (inherit_input_method),
+                      !NILP (keep_all));
  UNGCPRO;
  return val;
 }
@@ -1005,7 +1011,7 @@ arguments are used as in `read-from-minibuffer')  */)
  CHECK_STRING (prompt);
  return read_minibuf (Vminibuffer_local_map, initial_contents,
                       prompt, Qnil, 1, Qminibuffer_history,
-                       make_number (0), Qnil, 0, 0);
+                       make_number (0), Qnil, 0, 0, 0);
 }
 DEFUN ("eval-minibuffer", Feval_minibuffer, Seval_minibuffer, 1, 2, 0,
@@ -1043,7 +1049,7 @@ Fifth arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits
  Lisp_Object val;
  val = Fread_from_minibuffer (prompt, initial_input, Qnil,
                               Qnil, history, default_value,
-                               inherit_input_method);
+                               inherit_input_method, Qnil);
  if (STRINGP (val) && SCHARS (val) == 0 && ! NILP (default_value))
    val = default_value;
  return val;
@@ -1065,7 +1071,7 @@ the current input method and the setting of`enable-multibyte-characters'.  */)
  CHECK_STRING (prompt);
  return read_minibuf (Vminibuffer_local_ns_map, initial, prompt, Qnil,
                       0, Qminibuffer_history, make_number (0), Qnil, 0,
-                       !NILP (inherit_input_method));
+                       !NILP (inherit_input_method), 0);
 }
 DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0,
@@ -1716,7 +1722,7 @@ Completion ignores case if the ambient value of
                      : Vminibuffer_local_must_match_map,
                      init, prompt, make_number (pos), 0,
                      histvar, histpos, def, 0,
-                      !NILP (inherit_input_method));
+                      !NILP (inherit_input_method), 0);
  if (STRINGP (val) && SCHARS (val) == 0 && ! NILP (def))
    val = def;
@@ -2081,9 +2087,29 @@ a repetition of this command will exit.  */)
  if (XINT (Fminibuffer_prompt_end ()) == ZV)
    goto exit;
-  if (!NILP (Ftest_completion (Fminibuffer_contents (),
+  val = Fminibuffer_contents ();
+  if (!NILP (Ftest_completion (val,
                               Vminibuffer_completion_table,
                               Vminibuffer_completion_predicate)))
+    {
+      if (completion_ignore_case)
+        { /* Fixup case of the field, if necessary. */
+          Lisp_Object compl
+            = Ftry_completion (val,
+                               Vminibuffer_completion_table,
+                               Vminibuffer_completion_predicate);
+          if (STRINGP (compl)
+              /* If it weren't for this piece of paranoia, I'd replace
+                 the whole thing with a call to do_completion. */
+              && EQ (Flength (val), Flength (compl)))
+            {
+              del_range (XINT (Fminibuffer_prompt_end ()), ZV);
+              Finsert (1, &compl);
+            }
+        }
+      goto exit;
+    }
    goto exit;
  /* Call do_completion, but ignore errors.  */
@@ -2691,8 +2717,8 @@ elements are deleted.  */);
  DEFVAR_BOOL ("completion-ignore-case", &completion_ignore_case,
               doc: /* Non-nil means don't consider case significant in completion.
-See also `read-file-name-completion-ignore-case' concerning case significance
+For file-name completion, the variable `read-file-name-completion-ignore-case'
-in completion when reading a file name.  */);
+controls the behavior, rather than this variable.  */);
  completion_ignore_case = 0;
  DEFVAR_BOOL ("enable-recursive-minibuffers", &enable_recursive_minibuffers,
diff --git a/src/regex.c b/src/regex.c
index 36787238a32..a53eac29216 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -1250,7 +1250,7 @@ reg_syntax_t re_syntax_options;
 reg_syntax_t
 re_set_syntax (syntax)
-    reg_syntax_t syntax;
+     reg_syntax_t syntax;
 {
  reg_syntax_t ret = re_syntax_options;
@@ -1258,6 +1258,17 @@ re_set_syntax (syntax)
  return ret;
 }
 WEAK_ALIAS (__re_set_syntax, re_set_syntax)
+/* Regexp to use to replace spaces, or NULL meaning don't.  */
+static re_char *whitespace_regexp;
+void
+re_set_whitespace_regexp (regexp)
+     re_char *regexp;
+{
+  whitespace_regexp = regexp;
+}
+WEAK_ALIAS (__re_set_syntax, re_set_syntax)
 /* This table gives an error message for each of the error codes listed
   in regex.h.  Obviously the order here has to be same as there.
@@ -2436,6 +2447,15 @@ regex_compile (pattern, size, syntax, bufp)
  /* If the object matched can contain multibyte characters.  */
  const boolean multibyte = RE_MULTIBYTE_P (bufp);
+  /* Nonzero if we have pushed down into a subpattern.  */
+  int in_subpattern = 0;
+  /* These hold the values of p, pattern, and pend from the main
+     pattern when we have pushed into a subpattern.  */
+  re_char *main_p;
+  re_char *main_pattern;
+  re_char *main_pend;
 #ifdef DEBUG
  debug++;
  DEBUG_PRINT1 ("\nCompiling pattern: ");
@@ -2498,12 +2518,61 @@ regex_compile (pattern, size, syntax, bufp)
  begalt = b = bufp->buffer;
  /* Loop through the uncompiled pattern until we're at the end.  */
-  while (p != pend)
+  while (1)
    {
+      if (p == pend)
+        {
+          /* If this is the end of an included regexp,
+             pop back to the main regexp and try again.  */
+          if (in_subpattern)
+            {
+              in_subpattern = 0;
+              pattern = main_pattern;
+              p = main_p;
+              pend = main_pend;
+              continue;
+            }
+          /* If this is the end of the main regexp, we are done.  */
+          break;
+        }
      PATFETCH (c);
      switch (c)
        {
+        case ' ':
+          {
+            re_char *p1 = p;
+            /* If there's no special whitespace regexp, treat
+               spaces normally.  And don't try to do this recursively.  */
+            if (!whitespace_regexp || in_subpattern)
+              goto normal_char;
+            /* Peek past following spaces.  */
+            while (p1 != pend)
+              {
+                if (*p1 != ' ')
+                  break;
+                p1++;
+              }
+            /* If the spaces are followed by a repetition op,
+               treat them normally.  */
+            if (p1 == pend
+                || (*p1 == '*' || *p1 == '+' || *p1 == '?'
+                    || (*p1 == '\\' && p1 + 1 != pend && p1[1] == '{')))
+              goto normal_char;
+            /* Replace the spaces with the whitespace regexp.  */
+            in_subpattern = 1;
+            main_p = p1;
+            main_pend = pend;
+            main_pattern = pattern;
+            p = pattern = whitespace_regexp;
+            pend = p + strlen (p);
+            break;
+          }    
        case '^':
          {
            if (   /* If at start of pattern, it's an operator.  */
diff --git a/src/search.c b/src/search.c
index 1742cfb08c2..56611ca7af8 100644
--- a/src/search.c
+++ b/src/search.c
@@ -41,7 +41,7 @@ Boston, MA 02111-1307, USA.  */
 struct regexp_cache
 {
  struct regexp_cache *next;
-  Lisp_Object regexp;
+  Lisp_Object regexp, whitespace_regexp;
  struct re_pattern_buffer buf;
  char fastmap[0400];
  /* Nonzero means regexp was compiled to do full POSIX backtracking.  */
@@ -83,6 +83,8 @@ static Lisp_Object last_thing_searched;
 Lisp_Object Qinvalid_regexp;
+Lisp_Object Vsearch_spaces_regexp;
 static void set_search_regs ();
 static void save_search_regs ();
 static int simple_search ();
@@ -107,7 +109,9 @@ matcher_overflow ()
   for this pattern.  0 means backtrack only enough to get a valid match.
   MULTIBYTE is nonzero if we want to handle multibyte characters in
   PATTERN.  0 means all multibyte characters are recognized just as
-   sequences of binary data.  */
+   sequences of binary data.
+   The behavior also depends on Vsearch_spaces_regexp.  */
 static void
 compile_pattern_1 (cp, pattern, translate, regp, posix, multibyte)
@@ -158,11 +162,19 @@ compile_pattern_1 (cp, pattern, translate, regp, posix, multibyte)
  cp->buf.translate = (! NILP (translate) ? translate : make_number (0));
  cp->posix = posix;
  cp->buf.multibyte = multibyte;
+  cp->whitespace_regexp = Vsearch_spaces_regexp;
  BLOCK_INPUT;
  old = re_set_syntax (RE_SYNTAX_EMACS
                       | (posix ? 0 : RE_NO_POSIX_BACKTRACKING));
+  re_set_whitespace_regexp (NILP (Vsearch_spaces_regexp) ? NULL
+                            : SDATA (Vsearch_spaces_regexp));
  val = (char *) re_compile_pattern ((char *)raw_pattern,
                                     raw_pattern_size, &cp->buf);
+  re_set_whitespace_regexp (NULL);
  re_set_syntax (old);
  UNBLOCK_INPUT;
  if (val)
@@ -223,7 +235,8 @@ compile_pattern (pattern, regp, translate, posix, multibyte)
          && !NILP (Fstring_equal (cp->regexp, pattern))
          && EQ (cp->buf.translate, (! NILP (translate) ? translate : make_number (0)))
          && cp->posix == posix
-          && cp->buf.multibyte == multibyte)
+          && cp->buf.multibyte == multibyte
+          && !NILP (Fequal (cp->whitespace_regexp, Vsearch_spaces_regexp)))
        break;
      /* If we're at the end of the cache, compile into the nil cell
@@ -1051,7 +1064,7 @@ search_buffer (string, pos, pos_byte, lim, lim_byte, n,
      return pos;
    }
-  if (RE && !trivial_regexp_p (string))
+  if (RE && !(trivial_regexp_p (string) && NILP (Vsearch_spaces_regexp)))
    {
      unsigned char *p1, *p2;
      int s1, s2;
@@ -2972,6 +2985,7 @@ syms_of_search ()
      searchbufs[i].buf.buffer = (unsigned char *) xmalloc (100);
      searchbufs[i].buf.fastmap = searchbufs[i].fastmap;
      searchbufs[i].regexp = Qnil;
+      searchbufs[i].whitespace_regexp = Qnil;
      staticpro (&searchbufs[i].regexp);
      searchbufs[i].next = (i == REGEXP_CACHE_SIZE-1 ? 0 : &searchbufs[i+1]);
    }
@@ -2998,6 +3012,14 @@ syms_of_search ()
  saved_last_thing_searched = Qnil;
  staticpro (&saved_last_thing_searched);
+  DEFVAR_LISP ("search-spaces-regexp", &Vsearch_spaces_regexp,
+      /* doc: Regexp to substitute for bunches of spaces in regexp search.
+Some commands use this for user-specified regexps.
+Spaces that occur inside character classes or repetition operators
+or other such regexp constructs are not replaced with this.
+A value of nil (which is the normal value) means treat spaces literally.  */);
+  Vsearch_spaces_regexp = Qnil;
  defsubr (&Slooking_at);
  defsubr (&Sposix_looking_at);
  defsubr (&Sstring_match);
diff --git a/src/w32term.c b/src/w32term.c
index aa9c0b96e92..0f6e9f67a66 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -260,7 +260,7 @@ static void x_frame_rehighlight P_ ((struct w32_display_info *));
 static void x_draw_hollow_cursor P_ ((struct window *, struct glyph_row *));
 static void x_draw_bar_cursor P_ ((struct window *, struct glyph_row *, int,
                                   enum text_cursor_kinds));
-static void w32_clip_to_row P_ ((struct window *, struct glyph_row *, HDC));
+static void w32_clip_to_row P_ ((struct window *, struct glyph_row *, int, HDC));
 static Lisp_Object Qvendor_specific_keysyms;
@@ -691,12 +691,12 @@ w32_draw_fringe_bitmap (w, row, p)
      int oldVH = row->visible_height;
      row->visible_height = p->h;
      row->y -= rowY - p->y;
-      w32_clip_to_row (w, row, hdc);
+      w32_clip_to_row (w, row, -1, hdc);
      row->y = oldY;
      row->visible_height = oldVH;
    }
  else
-    w32_clip_to_row (w, row, hdc);
+    w32_clip_to_row (w, row, -1, hdc);
  if (p->bx >= 0 && !p->overlay_p)
    {
@@ -4912,18 +4912,19 @@ w32_read_socket (sd, expected, hold_quit)
   mode lines must be clipped to the whole window.  */
 static void
-w32_clip_to_row (w, row, hdc)
+w32_clip_to_row (w, row, area, hdc)
     struct window *w;
     struct glyph_row *row;
+     int area;
     HDC hdc;
 {
  struct frame *f = XFRAME (WINDOW_FRAME (w));
  RECT clip_rect;
-  int window_y, window_width;
+  int window_x, window_y, window_width;
-  window_box (w, -1, 0, &window_y, &window_width, 0);
+  window_box (w, area, &window_x, &window_y, &window_width, 0);
-  clip_rect.left = WINDOW_TO_FRAME_PIXEL_X (w, 0);
+  clip_rect.left = window_x;
  clip_rect.top = WINDOW_TO_FRAME_PIXEL_Y (w, row->y);
  clip_rect.top = max (clip_rect.top, window_y);
  clip_rect.right = clip_rect.left + window_width;
@@ -4983,7 +4984,7 @@ x_draw_hollow_cursor (w, row)
  rect.right = rect.left + wd;
  hdc = get_frame_dc (f);
  /* Set clipping, draw the rectangle, and reset clipping again.  */
-  w32_clip_to_row (w, row, hdc);
+  w32_clip_to_row (w, row, TEXT_AREA, hdc);
  FrameRect (hdc, &rect, hb);
  DeleteObject (hb);
  w32_set_clip_rectangle (hdc, NULL);
@@ -5049,7 +5050,7 @@ x_draw_bar_cursor (w, row, width, kind)
      hdc = get_frame_dc (f);
-      w32_clip_to_row (w, row, hdc);
+      w32_clip_to_row (w, row, TEXT_AREA, hdc);
      if (kind == BAR_CURSOR)
        {
diff --git a/src/window.c b/src/window.c
index be5e9167d67..b202031878b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -243,7 +243,8 @@ make_window ()
  register struct window *p;
  p = allocate_window ();
-  XSETFASTINT (p->sequence_number, ++sequence_number);
+  ++sequence_number;
+  XSETFASTINT (p->sequence_number, sequence_number);
  XSETFASTINT (p->left_col, 0);
  XSETFASTINT (p->top_line, 0);
  XSETFASTINT (p->total_lines, 0);
@@ -2659,6 +2660,9 @@ shrink_windows (total, size, nchildren, shrinkable,
            --shrinkable;
            total_removed += smallest;
+            /* We don't know what the smallest is now.  */
+            smallest = total;
            /* Out of for, just remove one window at the time and
               check again if we have enough space.  */
            break;
@@ -2683,6 +2687,16 @@ shrink_windows (total, size, nchildren, shrinkable,
     that are left and still can be shrunk.  */
  while (total_shrink > total_removed)
    {
+      int nonzero_sizes = 0;
+      int nonzero_idx = -1;
+      for (i = 0; i < nchildren; ++i)
+        if (new_sizes[i] > 0)
+          {
+            ++nonzero_sizes;
+            nonzero_idx = i;
+          }
+      
      for (i = 0; i < nchildren; ++i)
        if (new_sizes[i] > min_size)
          {
@@ -2693,6 +2707,25 @@ shrink_windows (total, size, nchildren, shrinkable,
               check again if we have enough space.  */
            break;
          }
+      /* Special case, only one window left.  */
+      if (nonzero_sizes == 1)
+        break;
+    }
+  /* Any surplus due to rounding, we add to windows that are left.  */
+  while (total_shrink < total_removed)
+    {
+      for (i = 0; i < nchildren; ++i)
+        {
+          if (new_sizes[i] != 0 && total_shrink < total_removed)
+            {
+              ++new_sizes[i];
+              --total_removed;
+              break;
+            }
+        }
    }
  return new_sizes;
@@ -3119,7 +3152,8 @@ selects the buffer of the selected window before each command.  */)
  w = XWINDOW (window);
  w->frozen_window_start_p = 0;
-  XSETFASTINT (w->use_time, ++window_select_count);
+  ++window_select_count;
+  XSETFASTINT (w->use_time, window_select_count);
  if (EQ (window, selected_window))
    return window;
@@ -3610,7 +3644,8 @@ make_dummy_parent (window)
      = ((struct Lisp_Vector *)o)->contents[i];
  XSETWINDOW (new, p);
-  XSETFASTINT (p->sequence_number, ++sequence_number);
+  ++sequence_number;
+  XSETFASTINT (p->sequence_number, sequence_number);
  /* Put new into window structure in place of window */
  replace_window (window, new);
@@ -5852,7 +5887,7 @@ save_window_save (window, vector, i)
      p = SAVED_WINDOW_N (vector, i);
      w = XWINDOW (window);
-      XSETFASTINT (w->temslot, i++);
+      XSETFASTINT (w->temslot, i); i++;
      p->window = window;
      p->buffer = w->buffer;
      p->left_col = w->left_col;
diff --git a/src/xdisp.c b/src/xdisp.c
index c3f659a85e6..a872366f31b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -264,6 +264,10 @@ int mouse_autoselect_window;
 int auto_raise_tool_bar_buttons_p;
+/* Non-zero means to reposition window if cursor line is only partially visible.  */
+int make_cursor_line_fully_visible_p;
 /* Margin around tool bar buttons in pixels.  */
 Lisp_Object Vtool_bar_button_margin;
@@ -884,7 +888,7 @@ static void next_overlay_string P_ ((struct it *));
 static void reseat P_ ((struct it *, struct text_pos, int));
 static void reseat_1 P_ ((struct it *, struct text_pos, int));
 static void back_to_previous_visible_line_start P_ ((struct it *));
-static void reseat_at_previous_visible_line_start P_ ((struct it *));
+void reseat_at_previous_visible_line_start P_ ((struct it *));
 static void reseat_at_next_visible_line_start P_ ((struct it *, int));
 static int next_element_from_display_vector P_ ((struct it *));
 static int next_element_from_string P_ ((struct it *));
@@ -1781,7 +1785,8 @@ get_glyph_string_clip_rect (s, nr)
      /* If drawing a tool-bar window, draw it over the internal border
         at the top of the window.  */
-      if (s->w == XWINDOW (s->f->tool_bar_window))
+      if (WINDOWP (s->f->tool_bar_window)
+          && s->w == XWINDOW (s->f->tool_bar_window))
        r.y -= FRAME_INTERNAL_BORDER_WIDTH (s->f);
    }
@@ -4587,7 +4592,7 @@ back_to_previous_visible_line_start (it)
   selective display.  At the end, update IT's overlay information,
   face information etc.  */
-static void
+void
 reseat_at_previous_visible_line_start (it)
     struct it *it;
 {
@@ -4892,8 +4897,9 @@ get_next_display_element (it)
             translated to octal form.  */
          else if ((it->c < ' '
                    && (it->area != TEXT_AREA
-                        /* In mode line, treat \n, \t like other crl chars.  */
+                        /* In mode line, treat \n like other crl chars.  */
-                        || (it->glyph_row && it->glyph_row->mode_line_p)
+                        || (it->c != '\n'
+                            && it->glyph_row && it->glyph_row->mode_line_p)
                        || (it->c != '\n' && it->c != '\t')))
                   || (it->multibyte_p
                       ? ((it->c >= 127
@@ -5770,6 +5776,8 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
                                  result = MOVE_NEWLINE_OR_CR;
                                  break;
                                }
+                              if (it->method == next_element_from_display_vector)
+                                it->face_id = it->saved_face_id;
                            }
 #endif /* HAVE_WINDOW_SYSTEM */
                        }
@@ -6696,6 +6704,7 @@ message3 (m, nbytes, multibyte)
  struct gcpro gcpro1;
  GCPRO1 (m);
+  clear_message (1,1);
  /* First flush out any partial line written with print.  */
  message_log_maybe_newline ();
@@ -10886,6 +10895,9 @@ make_cursor_line_fully_visible (w, force_p)
  struct glyph_row *row;
  int window_height;
+  if (!make_cursor_line_fully_visible_p)
+    return 1;
  /* It's not always possible to find the cursor, e.g, when a window
     is full of overlay strings.  Don't do anything in that case.  */
  if (w->cursor.vpos < 0)
@@ -11473,7 +11485,8 @@ try_cursor_movement (window, startp, scroll_step)
              /* if PT is not in the glyph row, give up.  */
              rc = CURSOR_MOVEMENT_MUST_SCROLL;
            }
-          else if (MATRIX_ROW_PARTIALLY_VISIBLE_P (w, row))
+          else if (MATRIX_ROW_PARTIALLY_VISIBLE_P (w, row)
+                   && make_cursor_line_fully_visible_p)
            {
              if (PT == MATRIX_ROW_END_CHARPOS (row)
                  && !row->ends_at_zv_p
@@ -13519,7 +13532,9 @@ try_window_id (w)
         && CHARPOS (start) > BEGV)
        /* Old redisplay didn't take scroll margin into account at the bottom,
           but then global-hl-line-mode doesn't scroll.  KFS 2004-06-14 */
-        || w->cursor.y + cursor_height + this_scroll_margin > it.last_visible_y)
+        || (w->cursor.y + (make_cursor_line_fully_visible_p
+                           ? cursor_height + this_scroll_margin
+                           : 1)) > it.last_visible_y)
      {
        w->cursor.vpos = -1;
        clear_glyph_matrix (w->desired_matrix);
@@ -14776,6 +14791,8 @@ display_line (it)
                                  row->continued_p = 0;
                                  row->exact_window_width_line_p = 1;
                                }
+                              else if (it->method == next_element_from_display_vector)
+                                it->face_id = it->saved_face_id;
                            }
 #endif /* HAVE_WINDOW_SYSTEM */
                        }
@@ -15501,7 +15518,9 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
                  {
                    int bytepos = last - lisp_string;
                    int charpos = string_byte_to_char (elt, bytepos);
-                    int endpos = (precision <= 0 ? SCHARS (elt)
+                    int endpos = (precision <= 0
+                                  ? string_byte_to_char (elt,
+                                                         this - lisp_string)
                                  : charpos + nchars);
                    n += store_mode_line_string (NULL,
@@ -15809,7 +15828,7 @@ store_mode_line_string (string, lisp_string, copy_string, field_width, precision
        props = mode_line_string_face_prop;
      else if (!NILP (mode_line_string_face))
        {
-          Lisp_Object face = Fplist_get (props, Qface);
+          Lisp_Object face = Fsafe_plist_get (props, Qface);
          props = Fcopy_sequence (props);
          if (NILP (face))
            face = mode_line_string_face;
@@ -15834,7 +15853,7 @@ store_mode_line_string (string, lisp_string, copy_string, field_width, precision
          Lisp_Object face;
          if (NILP (props))
            props = Ftext_properties_at (make_number (0), lisp_string);
-          face = Fplist_get (props, Qface);
+          face = Fsafe_plist_get (props, Qface);
          if (NILP (face))
            face = mode_line_string_face;
          else
@@ -17283,7 +17302,8 @@ init_glyph_string (s, OPTIONAL_HDC (hdc) char2b, w, row, area, start, hl)
  s->y = WINDOW_TO_FRAME_PIXEL_Y (w, row->y);
  /* Display the internal border below the tool-bar window.  */
-  if (s->w == XWINDOW (s->f->tool_bar_window))
+  if (WINDOWP (s->f->tool_bar_window)
+      && s->w == XWINDOW (s->f->tool_bar_window))
    s->y -= FRAME_INTERNAL_BORDER_WIDTH (s->f);
  s->ybase = s->y + row->ascent;
@@ -18255,6 +18275,19 @@ draw_glyphs (w, x, row, area, start, end, hl, overlaps_p)
  return x_reached;
 }
+/* Expand row matrix if too narrow.  Don't expand if area
+   is not present.  */
+#define IT_EXPAND_MATRIX_WIDTH(it, area)                \
+  {                                                     \
+    if (!fonts_changed_p                                \
+        && (it->glyph_row->glyphs[area]                 \
+            < it->glyph_row->glyphs[area + 1]))         \
+      {                                                 \
+        it->w->ncols_scale_factor++;                    \
+        fonts_changed_p = 1;                            \
+      }                                                 \
+  }
 /* Store one glyph for IT->char_to_display in IT->glyph_row.
   Called from x_produce_glyphs when IT->glyph_row is non-null.  */
@@ -18292,11 +18325,8 @@ append_glyph (it)
      glyph->font_type = FONT_TYPE_UNKNOWN;
      ++it->glyph_row->used[area];
    }
-  else if (!fonts_changed_p)
+  else
-    {
+    IT_EXPAND_MATRIX_WIDTH (it, area);
-      it->w->ncols_scale_factor++;
-      fonts_changed_p = 1;
-    }
 }
 /* Store one glyph for the composition IT->cmp_id in IT->glyph_row.
@@ -18334,11 +18364,8 @@ append_composite_glyph (it)
      glyph->font_type = FONT_TYPE_UNKNOWN;
      ++it->glyph_row->used[area];
    }
-  else if (!fonts_changed_p)
+  else
-    {
+    IT_EXPAND_MATRIX_WIDTH (it, area);
-      it->w->ncols_scale_factor++;
-      fonts_changed_p = 1;
-    }
 }
@@ -18508,11 +18535,8 @@ produce_image_glyph (it)
          glyph->font_type = FONT_TYPE_UNKNOWN;
          ++it->glyph_row->used[area];
        }
-      else if (!fonts_changed_p)
+      else
-        {
+        IT_EXPAND_MATRIX_WIDTH (it, area);
-          it->w->ncols_scale_factor++;
-          fonts_changed_p = 1;
-        }
    }
 }
@@ -18556,11 +18580,8 @@ append_stretch_glyph (it, object, width, height, ascent)
      glyph->font_type = FONT_TYPE_UNKNOWN;
      ++it->glyph_row->used[area];
    }
-  else if (!fonts_changed_p)
+  else
-    {
+    IT_EXPAND_MATRIX_WIDTH (it, area);
-      it->w->ncols_scale_factor++;
-      fonts_changed_p = 1;
-    }
 }
@@ -18615,14 +18636,14 @@ produce_stretch_glyph (it)
  plist = XCDR (it->object);
  /* Compute the width of the stretch.  */
-  if ((prop = Fplist_get (plist, QCwidth), !NILP (prop))
+  if ((prop = Fsafe_plist_get (plist, QCwidth), !NILP (prop))
      && calc_pixel_width_or_height (&tem, it, prop, font, 1, 0))
    {
      /* Absolute width `:width WIDTH' specified and valid.  */
      zero_width_ok_p = 1;
      width = (int)tem;
    }
-  else if (prop = Fplist_get (plist, QCrelative_width),
+  else if (prop = Fsafe_plist_get (plist, QCrelative_width),
           NUMVAL (prop) > 0)
    {
      /* Relative width `:relative-width FACTOR' specified and valid.
@@ -18646,7 +18667,7 @@ produce_stretch_glyph (it)
      x_produce_glyphs (&it2);
      width = NUMVAL (prop) * it2.pixel_width;
    }
-  else if ((prop = Fplist_get (plist, QCalign_to), !NILP (prop))
+  else if ((prop = Fsafe_plist_get (plist, QCalign_to), !NILP (prop))
           && calc_pixel_width_or_height (&tem, it, prop, font, 1, &align_to))
    {
      if (it->glyph_row == NULL || !it->glyph_row->mode_line_p)
@@ -18666,13 +18687,13 @@ produce_stretch_glyph (it)
    width = 1;
  /* Compute height.  */
-  if ((prop = Fplist_get (plist, QCheight), !NILP (prop))
+  if ((prop = Fsafe_plist_get (plist, QCheight), !NILP (prop))
      && calc_pixel_width_or_height (&tem, it, prop, font, 0, 0))
    {
      height = (int)tem;
      zero_height_ok_p = 1;
    }
-  else if (prop = Fplist_get (plist, QCrelative_height),
+  else if (prop = Fsafe_plist_get (plist, QCrelative_height),
           NUMVAL (prop) > 0)
    height = FONT_HEIGHT (font) * NUMVAL (prop);
  else
@@ -18684,7 +18705,7 @@ produce_stretch_glyph (it)
  /* Compute percentage of height used for ascent.  If
     `:ascent ASCENT' is present and valid, use that.  Otherwise,
     derive the ascent from the font in use.  */
-  if (prop = Fplist_get (plist, QCascent),
+  if (prop = Fsafe_plist_get (plist, QCascent),
      NUMVAL (prop) > 0 && NUMVAL (prop) <= 100)
    ascent = height * NUMVAL (prop) / 100.0;
  else if (!NILP (prop)
@@ -20055,6 +20076,11 @@ erase_phys_cursor (w)
  if (!cursor_row->enabled_p)
    goto mark_cursor_off;
+  /* If line spacing is > 0, old cursor may only be partially visible in
+     window after split-window.  So adjust visible height.  */
+  cursor_row->visible_height = min (cursor_row->visible_height,
+                                    window_text_bottom_y (w) - cursor_row->y);
  /* If row is completely invisible, don't attempt to delete a cursor which
     isn't there.  This can happen if cursor is at top of a window, and
     we switch to a buffer with a header line in that window.  */
@@ -20098,6 +20124,7 @@ erase_phys_cursor (w)
    {
      int x, y;
      int header_line_height = WINDOW_HEADER_LINE_HEIGHT (w);
+      int width;
      cursor_glyph = get_phys_cursor_glyph (w);
      if (cursor_glyph == NULL)
@@ -20105,9 +20132,10 @@ erase_phys_cursor (w)
      x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
      y = WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height, cursor_row->y));
+      width = min (cursor_glyph->pixel_width,
+                   window_box_width (w, TEXT_AREA) - w->phys_cursor.x);
-      FRAME_RIF (f)->clear_frame_area (f, x, y,
+      FRAME_RIF (f)->clear_frame_area (f, x, y, width, cursor_row->visible_height);
-                                       cursor_glyph->pixel_width, cursor_row->visible_height);
    }
  /* Erase the cursor by redrawing the character underneath it.  */
@@ -20887,7 +20915,7 @@ note_mode_line_or_margin_highlight (w, x, y, area)
  if (IMAGEP (object))
    {
      Lisp_Object image_map, hotspot;
-      if ((image_map = Fplist_get (XCDR (object), QCmap),
+      if ((image_map = Fsafe_plist_get (XCDR (object), QCmap),
           !NILP (image_map))
          && (hotspot = find_hot_spot (image_map, dx, dy),
              CONSP (hotspot))
@@ -20899,12 +20927,14 @@ note_mode_line_or_margin_highlight (w, x, y, area)
          /* Could check AREA_ID to see if we enter/leave this hot-spot.
             If so, we could look for mouse-enter, mouse-leave
             properties in PLIST (and do something...).  */
-          if ((plist = XCDR (hotspot), CONSP (plist)))
+          hotspot = XCDR (hotspot);
+          if (CONSP (hotspot)
+              && (plist = XCAR (hotspot), CONSP (plist)))
            {
-              pointer = Fplist_get (plist, Qpointer);
+              pointer = Fsafe_plist_get (plist, Qpointer);
              if (NILP (pointer))
                pointer = Qhand;
-              help = Fplist_get (plist, Qhelp_echo);
+              help = Fsafe_plist_get (plist, Qhelp_echo);
              if (!NILP (help))
                {
                  help_echo_string = help;
@@ -20915,7 +20945,7 @@ note_mode_line_or_margin_highlight (w, x, y, area)
                }
            }
          if (NILP (pointer))
-            pointer = Fplist_get (XCDR (object), QCpointer);
+            pointer = Fsafe_plist_get (XCDR (object), QCpointer);
        }
    }
@@ -20925,13 +20955,16 @@ note_mode_line_or_margin_highlight (w, x, y, area)
      /* If we're on a string with `help-echo' text property, arrange
         for the help to be displayed.  This is done by setting the
         global variable help_echo_string to the help string.  */
-      help = Fget_text_property (pos, Qhelp_echo, string);
+      if (NILP (help))
-      if (!NILP (help))
        {
-          help_echo_string = help;
+          help = Fget_text_property (pos, Qhelp_echo, string);
-          XSETWINDOW (help_echo_window, w);
+          if (!NILP (help))
-          help_echo_object = string;
+            {
-          help_echo_pos = charpos;
+              help_echo_string = help;
+              XSETWINDOW (help_echo_window, w);
+              help_echo_object = string;
+              help_echo_pos = charpos;
+            }
        }
      if (NILP (pointer))
@@ -21066,7 +21099,7 @@ note_mouse_highlight (f, x, y)
          if (img != NULL && IMAGEP (img->spec))
            {
              Lisp_Object image_map, hotspot;
-              if ((image_map = Fplist_get (XCDR (img->spec), QCmap),
+              if ((image_map = Fsafe_plist_get (XCDR (img->spec), QCmap),
                   !NILP (image_map))
                  && (hotspot = find_hot_spot (image_map,
                                               glyph->slice.x + dx,
@@ -21080,12 +21113,14 @@ note_mouse_highlight (f, x, y)
                  /* Could check AREA_ID to see if we enter/leave this hot-spot.
                     If so, we could look for mouse-enter, mouse-leave
                     properties in PLIST (and do something...).  */
-                  if ((plist = XCDR (hotspot), CONSP (plist)))
+                  hotspot = XCDR (hotspot);
+                  if (CONSP (hotspot)
+                      && (plist = XCAR (hotspot), CONSP (plist)))
                    {
-                      pointer = Fplist_get (plist, Qpointer);
+                      pointer = Fsafe_plist_get (plist, Qpointer);
                      if (NILP (pointer))
                        pointer = Qhand;
-                      help_echo_string = Fplist_get (plist, Qhelp_echo);
+                      help_echo_string = Fsafe_plist_get (plist, Qhelp_echo);
                      if (!NILP (help_echo_string))
                        {
                          help_echo_window = window;
@@ -21095,7 +21130,7 @@ note_mouse_highlight (f, x, y)
                    }
                }
              if (NILP (pointer))
-                pointer = Fplist_get (XCDR (img->spec), QCpointer);
+                pointer = Fsafe_plist_get (XCDR (img->spec), QCpointer);
            }
        }
@@ -22394,6 +22429,10 @@ otherwise.  */);
    doc: /* *Non-nil means raise tool-bar buttons when the mouse moves over them.  */);
  auto_raise_tool_bar_buttons_p = 1;
+  DEFVAR_BOOL ("make-cursor-line-fully-visible", &make_cursor_line_fully_visible_p,
+    doc: /* *Non-nil means to scroll (recenter) cursor line if it is not fully visible.  */);
+  make_cursor_line_fully_visible_p = 1;
  DEFVAR_LISP ("tool-bar-button-margin", &Vtool_bar_button_margin,
    doc: /* *Margin around tool-bar buttons in pixels.
 If an integer, use that for both horizontal and vertical margins.
diff --git a/src/xfns.c b/src/xfns.c
index cdce77f158f..a99f3ddd1b8 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5129,6 +5129,23 @@ file_dialog_unmap_cb (widget, client_data, call_data)
  *result = XmCR_CANCEL;
 }
+static Lisp_Object
+clean_up_file_dialog (arg)
+     Lisp_Object arg;
+{
+  struct Lisp_Save_Value *p = XSAVE_VALUE (arg);
+  Widget dialog = (Widget) p->pointer;
+  /* Clean up.  */
+  BLOCK_INPUT;
+  XtUnmanageChild (dialog);
+  XtDestroyWidget (dialog);
+  x_menu_set_in_use (0);
+  UNBLOCK_INPUT;
+  return Qnil;
+}
 DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 5, 0,
       doc: /* Read file name, prompting with PROMPT in directory DIR.
@@ -5150,6 +5167,10 @@ or directory must exist.  ONLY-DIR-P is ignored."  */)
  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
  GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file);
+  if (popup_activated ())
+    error ("Trying to use a menu from within a menu-entry");
  CHECK_STRING (prompt);
  CHECK_STRING (dir);
@@ -5232,13 +5253,17 @@ or directory must exist.  ONLY-DIR-P is ignored."  */)
      XmStringFree (default_xmstring);
    }
+  record_unwind_protect (clean_up_file_dialog, make_save_value (dialog, 0));
  /* Process events until the user presses Cancel or OK.  */
+  x_menu_set_in_use (1);
  result = 0;
  while (result == 0)
    {
      XEvent event;
+      x_menu_wait_for_event (0);
      XtAppNextEvent (Xt_app_con, &event);
-      (void) x_dispatch_event (&event, FRAME_X_DISPLAY (f) );
+      (void) x_dispatch_event (&event, FRAME_X_DISPLAY (f));
    }
  /* Get the result.  */
@@ -5256,9 +5281,6 @@ or directory must exist.  ONLY-DIR-P is ignored."  */)
  else
    file = Qnil;
-  /* Clean up.  */
-  XtUnmanageChild (dialog);
-  XtDestroyWidget (dialog);
  UNBLOCK_INPUT;
  UNGCPRO;
@@ -5273,6 +5295,15 @@ or directory must exist.  ONLY-DIR-P is ignored."  */)
 #ifdef USE_GTK
+static Lisp_Object
+clean_up_dialog (arg)
+     Lisp_Object arg;
+{
+  x_menu_set_in_use (0);
+  return Qnil;
+}
 DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 5, 0,
       doc: /* Read file name, prompting with PROMPT in directory DIR.
 Use a file selection dialog.  Select DEFAULT-FILENAME in the dialog's file
@@ -5285,16 +5316,21 @@ directories.  */)
  FRAME_PTR f = SELECTED_FRAME ();
  char *fn;
  Lisp_Object file = Qnil;
-  int count = specpdl_ptr - specpdl;
+  int count = SPECPDL_INDEX ();
  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
  char *cdef_file;
  GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file);
+  if (popup_activated ())
+    error ("Trying to use a menu from within a menu-entry");
  CHECK_STRING (prompt);
  CHECK_STRING (dir);
  /* Prevent redisplay.  */
  specbind (Qinhibit_redisplay, Qt);
+  record_unwind_protect (clean_up_dialog, Qnil);
  BLOCK_INPUT;
diff --git a/src/xmenu.c b/src/xmenu.c
index 0a83266a482..f50237ea8c8 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -288,7 +288,7 @@ finish_menu_items ()
 static Lisp_Object
 unuse_menu_items (dummy)
-     int dummy;
+     Lisp_Object dummy;
 {
  return menu_items_inuse = Qnil;
 }
@@ -1118,9 +1118,19 @@ on the left of the dialog box and all following items on the right.
 #ifndef MSDOS
+/* Set menu_items_inuse so no other popup menu or dialog is created.  */
+void
+x_menu_set_in_use (in_use)
+     int in_use;
+{
+  menu_items_inuse = in_use ? Qt : Qnil;
+  popup_activated_flag = in_use;
+}
 /* Wait for an X event to arrive or for a timer to expire.  */
-static void
+void
 x_menu_wait_for_event (void *data)
 {
  extern EMACS_TIME timer_check P_ ((int));
@@ -1173,14 +1183,6 @@ x_menu_wait_for_event (void *data)
 #ifdef USE_X_TOOLKIT
-static Lisp_Object
-pop_down_menu (dummy)
-     int dummy;
-{
-  popup_activated_flag = 0;
-  return Qnil;
-}
 /* Loop in Xt until the menu pulldown or dialog popup has been
   popped down (deactivated).  This is used for x-popup-menu
   and x-popup-dialog; it is not used for the menu bar.
@@ -1200,9 +1202,6 @@ popup_get_selection (initial_event, dpyinfo, id, do_timers, down_on_keypress)
 {
  XEvent event;
-  int specpdl_count = SPECPDL_INDEX ();
-  record_unwind_protect (pop_down_menu, Qnil);
  while (popup_activated_flag)
    {
       if (initial_event)
@@ -1252,8 +1251,6 @@ popup_get_selection (initial_event, dpyinfo, id, do_timers, down_on_keypress)
      x_dispatch_event (&event, event.xany.display);
    }
-  unbind_to (specpdl_count, Qnil);
 }
 #endif /* USE_X_TOOLKIT */
@@ -1261,30 +1258,12 @@ popup_get_selection (initial_event, dpyinfo, id, do_timers, down_on_keypress)
 #ifdef USE_GTK
 /* Loop util popup_activated_flag is set to zero in a callback.
   Used for popup menus and dialogs. */
-static GtkWidget *current_menu;
-static Lisp_Object
-pop_down_menu (dummy)
-     int dummy;
-{
-  if (current_menu)
-    {
-      gtk_widget_unmap (current_menu);
-      current_menu = 0;
-      popup_activated_flag = 0;
-    }
-  return Qnil;
-}
 static void
 popup_widget_loop (do_timers, widget)
     int do_timers;
     GtkWidget *widget;
 {
-  int specpdl_count = SPECPDL_INDEX ();
-  current_menu = widget;
-  record_unwind_protect (pop_down_menu, Qnil);
  ++popup_activated_flag;
  /* Process events in the Gtk event loop until done.  */
@@ -1293,8 +1272,6 @@ popup_widget_loop (do_timers, widget)
      if (do_timers) x_menu_wait_for_event (0);
      gtk_main_iteration ();
    }
-  unbind_to (specpdl_count, Qnil);
 }
 #endif
@@ -2443,6 +2420,19 @@ popup_selection_callback (widget, client_data)
  if (cb_data) menu_item_selection = (Lisp_Object *) cb_data->call_data;
 }
+static Lisp_Object
+pop_down_menu (arg)
+     Lisp_Object arg;
+{
+  struct Lisp_Save_Value *p = XSAVE_VALUE (arg);
+  popup_activated_flag = 0;
+  BLOCK_INPUT;
+  gtk_widget_destroy (GTK_WIDGET (p->pointer));
+  UNBLOCK_INPUT;
+  return Qnil;
+}
 /* Pop up the menu for frame F defined by FIRST_WV at X/Y and loop until the
   menu pops down.
   menu_item_selection will be set to the selection.  */
@@ -2458,6 +2448,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click)
  GtkWidget *menu;
  GtkMenuPositionFunc pos_func = 0;  /* Pop up at pointer.  */
  struct next_popup_x_y popup_x_y;
+  int specpdl_count = SPECPDL_INDEX ();
  xg_crazy_callback_abort = 1;
  menu = xg_create_widget ("popup", first_wv->name, f, first_wv,
@@ -2488,13 +2479,15 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click)
  gtk_widget_show_all (menu);
  gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 0);
+  record_unwind_protect (pop_down_menu, make_save_value (menu, 0));
  /* Set this to one.  popup_widget_loop increases it by one, so it becomes
     two.  show_help_echo uses this to detect popup menus.  */
  popup_activated_flag = 1;
  /* Process events that apply to the menu.  */
-  popup_widget_loop (1, 0);
+  popup_widget_loop (1, menu);
-  gtk_widget_destroy (menu);
+  unbind_to (specpdl_count, Qnil);
  /* Must reset this manually because the button release event is not passed
     to Emacs event loop. */
@@ -2522,6 +2515,24 @@ popup_selection_callback (widget, id, client_data)
  menu_item_selection = (Lisp_Object *) client_data;
 }
+/* ARG is the LWLIB ID of the dialog box, represented
+   as a Lisp object as (HIGHPART . LOWPART).  */
+static Lisp_Object
+pop_down_menu (arg)
+     Lisp_Object arg;
+{
+  LWLIB_ID id = (XINT (XCAR (arg)) << 4 * sizeof (LWLIB_ID)
+                 | XINT (XCDR (arg)));
+  BLOCK_INPUT;
+  lw_destroy_all_widgets (id);
+  UNBLOCK_INPUT;
+  popup_activated_flag = 0;
+  return Qnil;
+}
 /* Pop up the menu for frame F defined by FIRST_WV at X/Y and loop until the
   menu pops down.
   menu_item_selection will be set to the selection.  */
@@ -2578,15 +2589,19 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click)
  /* Display the menu.  */
  lw_popup_menu (menu, (XEvent *) &dummy);
  popup_activated_flag = 1;
+  
+  {
+    int fact = 4 * sizeof (LWLIB_ID);
+    int specpdl_count = SPECPDL_INDEX ();
+    record_unwind_protect (pop_down_menu,
+                           Fcons (make_number (menu_id >> (fact)),
+                                  make_number (menu_id & ~(-1 << (fact)))));
-  /* Process events that apply to the menu.  */
+    /* Process events that apply to the menu.  */
-  popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id, 1, 0);
+    popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id, 1, 0);
-  /* fp turned off the following statement and wrote a comment
+    unbind_to (specpdl_count, Qnil);
-     that it is unnecessary--that the menu has already disappeared.
+  }
-     Nowadays the menu disappears ok, all right, but
-     we need to delete the widgets or multiple ones will pile up.  */
-  lw_destroy_all_widgets (menu_id);
 }
 #endif /* not USE_GTK */
@@ -2897,13 +2912,16 @@ create_and_show_dialog (f, first_wv)
  if (menu)
    {
+      int specpdl_count = SPECPDL_INDEX ();
+      record_unwind_protect (pop_down_menu, make_save_value (menu, 0));
      /* Display the menu.  */
      gtk_widget_show_all (menu);
      /* Process events that apply to the menu.  */
      popup_widget_loop (1, menu);
-      gtk_widget_destroy (menu);
+      unbind_to (specpdl_count, Qnil);
    }
 }
@@ -2926,23 +2944,6 @@ dialog_selection_callback (widget, id, client_data)
 }
-/* ARG is the LWLIB ID of the dialog box, represented
-   as a Lisp object as (HIGHPART . LOWPART).  */
-Lisp_Object
-xdialog_show_unwind (arg)
-     Lisp_Object arg;
-{
-  LWLIB_ID id = (XINT (XCAR (arg)) << 4 * sizeof (LWLIB_ID)
-                 | XINT (XCDR (arg)));
-  BLOCK_INPUT;
-  lw_destroy_all_widgets (id);
-  UNBLOCK_INPUT;
-  popup_activated_flag = 0;
-  return Qnil;
-}
 /* Pop up the dialog for frame F defined by FIRST_WV and loop until the
   dialog pops down.
   menu_item_selection will be set to the selection.  */
@@ -2970,7 +2971,7 @@ create_and_show_dialog (f, first_wv)
    int fact = 4 * sizeof (LWLIB_ID);
    /* xdialog_show_unwind is responsible for popping the dialog box down.  */
-    record_unwind_protect (xdialog_show_unwind,
+    record_unwind_protect (pop_down_menu,
                           Fcons (make_number (dialog_id >> (fact)),
                                  make_number (dialog_id & ~(-1 << (fact)))));
@@ -3203,6 +3204,41 @@ menu_help_callback (help_string, pane, item)
                  Qnil, menu_object, make_number (item), 1);
 }
+static Lisp_Object
+pop_down_menu (arg)
+     Lisp_Object arg;
+{
+  struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg));
+  struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg));
+  
+  FRAME_PTR f = p1->pointer;
+  XMenu *menu = p2->pointer;
+  BLOCK_INPUT;
+#ifndef MSDOS
+  XUngrabPointer (FRAME_X_DISPLAY (f), CurrentTime);
+  XUngrabKeyboard (FRAME_X_DISPLAY (f), CurrentTime);
+#endif
+  XMenuDestroy (FRAME_X_DISPLAY (f), menu);
+#ifdef HAVE_X_WINDOWS
+  /* Assume the mouse has moved out of the X window.
+     If it has actually moved in, we will get an EnterNotify.  */
+  x_mouse_leave (FRAME_X_DISPLAY_INFO (f));
+  /* State that no mouse buttons are now held.
+     (The oldXMenu code doesn't track this info for us.)
+     That is not necessarily true, but the fiction leads to reasonable
+     results, and it is a pain to ask which are actually held now.  */
+  FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
+#endif /* HAVE_X_WINDOWS */
+  UNBLOCK_INPUT;
+  return Qnil;
+}
 static Lisp_Object
 xmenu_show (f, x, y, for_click, keymaps, title, error)
@@ -3224,6 +3260,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
  int maxwidth;
  int dummy_int;
  unsigned int dummy_uint;
+  int specpdl_count = SPECPDL_INDEX ();
  *error = 0;
  if (menu_items_n_panes == 0)
@@ -3416,20 +3453,17 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
 #ifndef MSDOS
  XMenuActivateSetWaitFunction (x_menu_wait_for_event, FRAME_X_DISPLAY (f));
 #endif
+  
+  record_unwind_protect (pop_down_menu,
+                         Fcons (make_save_value (f, 0),
+                                make_save_value (menu, 0)));
  /* Help display under X won't work because XMenuActivate contains
     a loop that doesn't give Emacs a chance to process it.  */
  menu_help_frame = f;
  status = XMenuActivate (FRAME_X_DISPLAY (f), menu, &pane, &selidx,
-                          x, y, ButtonReleaseMask, &datap,
+                          x, y, ButtonReleaseMask, &datap,
-                          menu_help_callback);
+                          menu_help_callback);
-#ifdef HAVE_X_WINDOWS
-  /* Assume the mouse has moved out of the X window.
-     If it has actually moved in, we will get an EnterNotify.  */
-  x_mouse_leave (FRAME_X_DISPLAY_INFO (f));
-#endif
  switch (status)
    {
@@ -3480,15 +3514,8 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
      entry = Qnil;
      break;
    }
-  XMenuDestroy (FRAME_X_DISPLAY (f), menu);
-#ifdef HAVE_X_WINDOWS
+  unbind_to (specpdl_count, Qnil);
-  /* State that no mouse buttons are now held.
-     (The oldXMenu code doesn't track this info for us.)
-     That is not necessarily true, but the fiction leads to reasonable
-     results, and it is a pain to ask which are actually held now.  */
-  FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
-#endif
  return entry;
 }
diff --git a/src/xterm.c b/src/xterm.c
index a1fd1d5dcc2..5c7775d6777 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -358,7 +358,7 @@ static void x_draw_hollow_cursor P_ ((struct window *, struct glyph_row *));
 static void x_draw_bar_cursor P_ ((struct window *, struct glyph_row *, int,
                                   enum text_cursor_kinds));
-static void x_clip_to_row P_ ((struct window *, struct glyph_row *, GC));
+static void x_clip_to_row P_ ((struct window *, struct glyph_row *, int, GC));
 static void x_flush P_ ((struct frame *f));
 static void x_update_begin P_ ((struct frame *));
 static void x_update_window_begin P_ ((struct window *));
@@ -710,12 +710,12 @@ x_draw_fringe_bitmap (w, row, p)
      int oldVH = row->visible_height;
      row->visible_height = p->h;
      row->y -= rowY - p->y;
-      x_clip_to_row (w, row, gc);
+      x_clip_to_row (w, row, -1, gc);
      row->y = oldY;
      row->visible_height = oldVH;
    }
  else
-    x_clip_to_row (w, row, gc);
+    x_clip_to_row (w, row, -1, gc);
  if (p->bx >= 0 && !p->overlay_p)
    {
@@ -7139,18 +7139,19 @@ XTread_socket (display, expected, hold_quit)
   mode lines must be clipped to the whole window.  */
 static void
-x_clip_to_row (w, row, gc)
+x_clip_to_row (w, row, area, gc)
     struct window *w;
     struct glyph_row *row;
+     int area;
     GC gc;
 {
  struct frame *f = XFRAME (WINDOW_FRAME (w));
  XRectangle clip_rect;
-  int window_y, window_width;
+  int window_x, window_y, window_width;
-  window_box (w, -1, 0, &window_y, &window_width, 0);
+  window_box (w, area, &window_x, &window_y, &window_width, 0);
-  clip_rect.x = WINDOW_TO_FRAME_PIXEL_X (w, 0);
+  clip_rect.x = window_x;
  clip_rect.y = WINDOW_TO_FRAME_PIXEL_Y (w, row->y);
  clip_rect.y = max (clip_rect.y, window_y);
  clip_rect.width = window_width;
@@ -7216,7 +7217,7 @@ x_draw_hollow_cursor (w, row)
  gc = dpyinfo->scratch_cursor_gc;
  /* Set clipping, draw the rectangle, and reset clipping again.  */
-  x_clip_to_row (w, row, gc);
+  x_clip_to_row (w, row, TEXT_AREA, gc);
  XDrawRectangle (dpy, FRAME_X_WINDOW (f), gc, x, y, wd, h);
  XSetClipMask (dpy, gc, None);
 }
@@ -7288,7 +7289,7 @@ x_draw_bar_cursor (w, row, width, kind)
      width = min (cursor_glyph->pixel_width, width);
      w->phys_cursor_width = width;
-      x_clip_to_row (w, row, gc);
+      x_clip_to_row (w, row, TEXT_AREA, gc);
      if (kind == BAR_CURSOR)
          XFillRectangle (dpy, window, gc,
diff --git a/src/xterm.h b/src/xterm.h
index 23f0e43d149..f9bb6adb6e1 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1072,6 +1072,8 @@ extern void x_free_dpy_colors P_ ((Display *, Screen *, Colormap,
 /* Defined in xmenu.c */
+extern void x_menu_set_in_use P_ ((int));
+extern void x_menu_wait_for_event P_ ((void *data));
 extern void x_activate_menubar P_ ((struct frame *));
 extern int popup_activated P_ ((void));
 extern void initialize_frame_menubar P_ ((struct frame *));
author	Karoly Lorentey	2004-11-22 11:06:39 +0000
committer	Karoly Lorentey	2004-11-22 11:06:39 +0000
commit	71925ac335f7c3b1fd97fba98cb5b9b4f03a6e23 (patch)
tree	63f61c3bebc83c114c16f31dd4ac2b9c0fe17c7d /src
parent	e417405015c93c81641f5c4a33ec898b5c353772 (diff)
parent	83aebfe62204109f19ef7dcca5429c1ddad21c57 (diff)
download	emacs-71925ac335f7c3b1fd97fba98cb5b9b4f03a6e23.tar.gz emacs-71925ac335f7c3b1fd97fba98cb5b9b4f03a6e23.zip