Merged from miles@gnu.org--gnu-2005 (patch 68, 286-291)

Patches applied:

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

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

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

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

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

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

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

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

15 files changed, 201 insertions, 105 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 47d24852a66..02a81fb7f7c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,85 @@
+2005-05-05  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * eval.c (Fdefvaralias): Doc fix.
+
+        * xmenu.c (Fx_popup_menu, Fx_popup_dialog): Doc fixes.
+
+2005-05-05  Kim F. Storm  <storm@cua.dk>
+
+        * buffer.c (init_buffer_once): Set cursor_in_non_selected_windows
+        default value.
+        (syms_of_buffer): Add default-cursor-in-non-selected-windows.
+        Fix type of cursor-in-non-selected-windows.
+
+2005-05-03  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * mac.c: #undef init_process so not to conflict with system headers.
+
+2005-05-02  Richard M. Stallman  <rms@gnu.org>
+
+        * buffer.c (syms_of_buffer): Define cursor-in-non-selected-windows.
+
+        * buffer.h (struct buffer): Add cursor_in_non_selected_windows slot.
+
+        * xdisp.c (Vcursor_in_non_selected_windows)
+        (Qcursor_in_non_selected_windows): Vars deleted.
+        (syms_of_xdisp): Don't initialize them.
+        (get_window_cursor_type): Use cursor_in_non_selected_windows
+        buffer slot.
+
+2005-05-02  Kim F. Storm  <storm@cua.dk>
+
+        * macros.c (executing_kbd_macro_index): Rename from
+        executing_macro_index.  All uses changed.
+        (executing_kbd_macro_iterations): Rename from
+        executing_macro_iterations.  All uses changed.
+        (executing_kbd_macro): Rename from executing_macro.
+        All uses changed.
+        (syms_of_macros): Rename Lisp var executing-macro-index to
+        executing-kbd-macro-index.
+
+        * xdisp.c (move_it_in_display_line_to): Fix last change.
+
+2005-05-01  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * xmenu.c (Fx_popup_menu): Doc fix.
+
+        * charset.c (syms_of_charset): Delete defsubr for Schars_in_region.
+
+2005-05-02  Jason Rumney  <jasonr@gnu.org>
+
+        * emacs.c (USAGE3, USAGE4): Keep strings below 2048 bytes.
+
+2005-05-02  Nozomu Ando  <nand@mac.com>
+
+        * sysselect.h: Fix typo.
+
+2005-05-02  Nick Roberts  <nickrob@snap.net.nz>
+
+        * charset.c (Fchars_in_region): Remove as obsolete.
+
+2005-05-01  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (move_it_in_display_line_to): Stop if we move beyond
+        TO_CHARPOS. This may happen if last glyphs was an image or stretch
+        glyph.
+
+2005-05-01  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * dispnew.c (sit_for): Vexecuting_macro -> Vexecuting_kbd_macro.
+
+2005-05-01  Richard M. Stallman  <rms@gnu.org>
+
+        * xmenu.c [not HAVE_X_TOOLKIT] (xmenu_show):
+        If user cancels the menu, quit unless FOR_CLICK.
+
+        * macros.c (Vexecuting_kbd_macro): Renamed from Vexecuting_macro.
+        All uses changed.
+        (syms_of_macros): Define only executing-kbd-macro, not executing-macro.
+        * keyboard.c: Change Vexecuting_macro to Vexecuting_kbd_macro.
+        * macros.h (Vexecuting_kbd_macro): Declare instead of Vexecuting_macro.
+        * commands.h (Vexecuting_kbd_macro): Likewise.
+
 2005-05-01  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * sysdep.c (get_frame_size) [VMS]: Use a fresh i/o channel.
diff --git a/src/buffer.c b/src/buffer.c
index 1fba9136375..e9567841c8e 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,6 +1,6 @@
 /* Buffer manipulation primitives for GNU Emacs.
-   Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 98, 99, 
-     2000, 01, 02, 03, 04, 2005 Free Software Foundation, Inc. 
+   Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 98, 99,
+     2000, 01, 02, 03, 04, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -4972,6 +4972,7 @@ init_buffer_once ()
   buffer_defaults.direction_reversed = Qnil;
   buffer_defaults.cursor_type = Qt;
   buffer_defaults.extra_line_spacing = Qnil;
+  buffer_defaults.cursor_in_non_selected_windows = Qt;
 
 #ifdef DOS_NT
   buffer_defaults.buffer_file_type = Qnil; /* TEXT */
@@ -5068,6 +5069,7 @@ init_buffer_once ()
   XSETFASTINT (buffer_local_flags.header_line_format, idx); ++idx;
   XSETFASTINT (buffer_local_flags.cursor_type, idx); ++idx;
   XSETFASTINT (buffer_local_flags.extra_line_spacing, idx); ++idx;
+  XSETFASTINT (buffer_local_flags.cursor_in_non_selected_windows, idx); ++idx;
 
   /* Need more room? */
   if (idx >= MAX_PER_BUFFER_VARS)
@@ -5259,6 +5261,11 @@ This is the same as (default-value 'cursor-type).  */);
                      doc: /* Default value of `line-spacing' for buffers that don't override it.
 This is the same as (default-value 'line-spacing).  */);
 
+  DEFVAR_LISP_NOPRO ("default-cursor-in-non-selected-windows",
+                     &buffer_defaults.cursor_in_non_selected_windows,
+                     doc: /* Default value of `cursor-in-non-selected-windows'.
+This is the same as (default-value 'cursor-in-non-selected-windows).  */);
+
   DEFVAR_LISP_NOPRO ("default-abbrev-mode",
                      &buffer_defaults.abbrev_mode,
                      doc: /* Default value of `abbrev-mode' for buffers that do not override it.
@@ -5938,6 +5945,11 @@ The space is measured in pixels, and put below lines on window systems.
 If value is a floating point number, it specifies the spacing relative
 to the default frame line height.  */);
 
+  DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows",
+                     &current_buffer->cursor_in_non_selected_windows, Qnil,
+    doc: /* *Cursor type to display in non-selected windows.
+t means to use hollow box cursor.  See `cursor-type' for other values.  */);
+
   DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions,
                doc: /* List of functions called with no args to query before killing a buffer.  */);
   Vkill_buffer_query_functions = Qnil;
diff --git a/src/buffer.h b/src/buffer.h
index bcb293a2e85..08627487c66 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -761,6 +761,11 @@ struct buffer
   /* An integer > 0 means put that number of pixels below text lines
      in the display of this buffer.  */
   Lisp_Object extra_line_spacing;
+
+  /* *Cursor type to display in non-selected windows.
+     t means to use hollow box cursor.
+     See `cursor-type' for other values.  */
+  Lisp_Object cursor_in_non_selected_windows;
 };
 
 
diff --git a/src/charset.c b/src/charset.c
index c03107a9c46..4a51c389d6d 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1431,22 +1431,6 @@ The returned value is 0 for left-to-right and 1 for right-to-left.  */)
   return CHARSET_TABLE_INFO (charset, CHARSET_DIRECTION_IDX);
 }
 
-DEFUN ("chars-in-region", Fchars_in_region, Schars_in_region, 2, 2, 0,
-       doc: /* Return number of characters between BEG and END.  */)
-     (beg, end)
-     Lisp_Object beg, end;
-{
-  int from, to;
-
-  CHECK_NUMBER_COERCE_MARKER (beg);
-  CHECK_NUMBER_COERCE_MARKER (end);
-
-  from = min (XFASTINT (beg), XFASTINT (end));
-  to = max (XFASTINT (beg), XFASTINT (end));
-
-  return make_number (to - from);
-}
-
 /* Return the number of characters in the NBYTES bytes at PTR.
    This works by looking at the contents and checking for multibyte sequences.
    However, if the current buffer has enable-multibyte-characters = nil,
@@ -1855,7 +1839,6 @@ syms_of_charset ()
   defsubr (&Schar_width);
   defsubr (&Sstring_width);
   defsubr (&Schar_direction);
-  defsubr (&Schars_in_region);
   defsubr (&Sstring);
   defsubr (&Ssetup_special_charsets);
 
diff --git a/src/commands.h b/src/commands.h
index f7831bc36a9..b9b1ad41933 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -76,11 +76,11 @@ extern Lisp_Object last_point_position_buffer;
 /* Nonzero means ^G can quit instantly */
 extern int immediate_quit;
 
-extern Lisp_Object Vexecuting_macro;
+extern Lisp_Object Vexecuting_kbd_macro;
 
 /* Nonzero if input is coming from the keyboard */
 
-#define INTERACTIVE (NILP (Vexecuting_macro) && !noninteractive)
+#define INTERACTIVE (NILP (Vexecuting_kbd_macro) && !noninteractive)
 
 /* Set this nonzero to force reconsideration of mode line. */
 
diff --git a/src/dispnew.c b/src/dispnew.c
index d7b5590c532..b0e9944868b 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6383,7 +6383,7 @@ sit_for (sec, usec, reading, display, initial_display)
 {
   swallow_events (display);
 
-  if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_macro))
+  if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_kbd_macro))
     return Qnil;
 
   if (initial_display)
diff --git a/src/emacs.c b/src/emacs.c
index c084f61fd07..67cf1eb03be 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -324,16 +324,16 @@ Display options:\n\
 --xrm XRESOURCES                set additional X resources\n\
 --help                          display this help and exit\n\
 --version                       output version information and exit\n\
-\n\
+\n"
+
+#define USAGE4 "\
 You can generally also specify long option names with a single -; for\n\
 example, -batch as well as --batch.  You can use any unambiguous\n\
 abbreviation for a --option.\n\
 \n\
 Various environment variables and window system resources also affect\n\
 Emacs' operation.  See the main documentation.\n\
-\n"
-
-#define USAGE4 "\
+\n\
 Report bugs to %s.  First, please see the Bugs\n\
 section of the Emacs manual or the file BUGS.\n"
 
diff --git a/src/eval.c b/src/eval.c
index 6832f3197ad..8b6c1885727 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -725,7 +725,9 @@ DEFUN ("defvaralias", Fdefvaralias, Sdefvaralias, 2, 3, 0,
        doc: /* Make SYMBOL a variable alias for symbol ALIASED.
 Setting the value of SYMBOL will subsequently set the value of ALIASED,
 and getting the value of SYMBOL will return the value ALIASED has.
-Third arg DOCSTRING, if non-nil, is documentation for SYMBOL.
+Third arg DOCSTRING, if non-nil, is documentation for SYMBOL.  If it is
+omitted or nil, SYMBOL gets the documentation string of ALIASED, or of the
+variable at the end of the chain of aliases, if ALIASED is itself an alias.
 The return value is ALIASED.  */)
      (symbol, aliased, docstring)
      Lisp_Object symbol, aliased, docstring;
diff --git a/src/keyboard.c b/src/keyboard.c
index 9afcab10acd..e78b51d247b 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1162,21 +1162,21 @@ cmd_error (data)
     cancel_hourglass ();
 #endif
 
-  if (!NILP (executing_macro))
+  if (!NILP (executing_kbd_macro))
     {
-      if (executing_macro_iterations == 1)
+      if (executing_kbd_macro_iterations == 1)
         sprintf (macroerror, "After 1 kbd macro iteration: ");
       else
         sprintf (macroerror, "After %d kbd macro iterations: ",
-                 executing_macro_iterations);
+                 executing_kbd_macro_iterations);
     }
   else
     *macroerror = 0;
 
   Vstandard_output = Qt;
   Vstandard_input = Qt;
-  Vexecuting_macro = Qnil;
-  executing_macro = Qnil;
+  Vexecuting_kbd_macro = Qnil;
+  executing_kbd_macro = Qnil;
   current_kboard->Vprefix_arg = Qnil;
   current_kboard->Vlast_prefix_arg = Qnil;
   cancel_echoing ();
@@ -1273,7 +1273,7 @@ command_loop ()
     {
       Lisp_Object val;
       val = internal_catch (Qexit, command_loop_2, Qnil);
-      executing_macro = Qnil;
+      executing_kbd_macro = Qnil;
       return val;
     }
   else
@@ -1285,7 +1285,7 @@ command_loop ()
            other reason. */
         any_kboard_state ();
         internal_catch (Qtop_level, command_loop_2, Qnil);
-        executing_macro = Qnil;
+        executing_kbd_macro = Qnil;
 
         /* End of file in -batch run causes exit here.  */
         if (noninteractive)
@@ -1438,7 +1438,7 @@ command_loop_1 ()
           if (NILP (Vunread_command_events)
               && NILP (Vunread_input_method_events)
               && NILP (Vunread_post_input_method_events)
-              && NILP (Vexecuting_macro)
+              && NILP (Vexecuting_kbd_macro)
               && !NILP (sit_for (0, post_command_idle_delay, 0, 1, 1)))
             safe_run_hooks (Qpost_command_idle_hook);
         }
@@ -1567,11 +1567,11 @@ command_loop_1 ()
         }
 
       cmd = read_key_sequence_cmd;
-      if (!NILP (Vexecuting_macro))
+      if (!NILP (Vexecuting_kbd_macro))
         {
           if (!NILP (Vquit_flag))
             {
-              Vexecuting_macro = Qt;
+              Vexecuting_kbd_macro = Qt;
               QUIT;             /* Make some noise. */
                                 /* Will return since macro now empty. */
             }
@@ -1670,7 +1670,7 @@ command_loop_1 ()
                       && EQ (current_buffer->selective_display, Qnil)
                       && !detect_input_pending ()
                       && NILP (XWINDOW (selected_window)->column_number_displayed)
-                      && NILP (Vexecuting_macro))
+                      && NILP (Vexecuting_kbd_macro))
                     direct_output_forward_char (1);
                   goto directly_done;
                 }
@@ -1705,7 +1705,7 @@ command_loop_1 ()
                       && EQ (current_buffer->selective_display, Qnil)
                       && !detect_input_pending ()
                       && NILP (XWINDOW (selected_window)->column_number_displayed)
-                      && NILP (Vexecuting_macro))
+                      && NILP (Vexecuting_kbd_macro))
                     direct_output_forward_char (-1);
                   goto directly_done;
                 }
@@ -1718,7 +1718,7 @@ command_loop_1 ()
                     = translate_char (Vtranslation_table_for_input,
                                       XFASTINT (last_command_char), 0, 0, 0);
                   int value;
-                  if (NILP (Vexecuting_macro)
+                  if (NILP (Vexecuting_kbd_macro)
                       && !EQ (minibuf_window, selected_window))
                     {
                       if (!nonundocount || nonundocount >= 20)
@@ -1740,7 +1740,7 @@ command_loop_1 ()
                           || !EQ (current_buffer->selective_display, Qnil)
                           || detect_input_pending ()
                           || !NILP (XWINDOW (selected_window)->column_number_displayed)
-                          || !NILP (Vexecuting_macro));
+                          || !NILP (Vexecuting_kbd_macro));
 
                   value = internal_self_insert (c, 0);
 
@@ -1768,7 +1768,7 @@ command_loop_1 ()
             int scount = SPECPDL_INDEX ();
 
             if (display_hourglass_p
-                && NILP (Vexecuting_macro))
+                && NILP (Vexecuting_kbd_macro))
               {
                 record_unwind_protect (cancel_hourglass_unwind, Qnil);
                 start_hourglass ();
@@ -1786,7 +1786,7 @@ command_loop_1 ()
              hourglass cursor anyway.
              But don't cancel the hourglass within a macro
              just because a command in the macro finishes.  */
-          if (NILP (Vexecuting_macro))
+          if (NILP (Vexecuting_kbd_macro))
             unbind_to (scount, Qnil);
 #endif
           }
@@ -1812,7 +1812,7 @@ command_loop_1 ()
           if (NILP (Vunread_command_events)
               && NILP (Vunread_input_method_events)
               && NILP (Vunread_post_input_method_events)
-              && NILP (Vexecuting_macro)
+              && NILP (Vexecuting_kbd_macro)
               && !NILP (sit_for (0, post_command_idle_delay, 0, 1, 1)))
             safe_run_hooks (Qpost_command_idle_hook);
         }
@@ -2493,7 +2493,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
 
   this_command_key_count_reset = 0;
 
-  if (!NILP (Vexecuting_macro))
+  if (!NILP (Vexecuting_kbd_macro))
     {
       /* We set this to Qmacro; since that's not a frame, nobody will
          try to switch frames on us, and the selected window will
@@ -2510,19 +2510,19 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
       /* Exit the macro if we are at the end.
          Also, some things replace the macro with t
          to force an early exit.  */
-      if (EQ (Vexecuting_macro, Qt)
-          || executing_macro_index >= XFASTINT (Flength (Vexecuting_macro)))
+      if (EQ (Vexecuting_kbd_macro, Qt)
+          || executing_kbd_macro_index >= XFASTINT (Flength (Vexecuting_kbd_macro)))
         {
           XSETINT (c, -1);
           goto exit;
         }
 
-      c = Faref (Vexecuting_macro, make_number (executing_macro_index));
-      if (STRINGP (Vexecuting_macro)
+      c = Faref (Vexecuting_kbd_macro, make_number (executing_kbd_macro_index));
+      if (STRINGP (Vexecuting_kbd_macro)
           && (XINT (c) & 0x80) && (XUINT (c) <= 0xff))
         XSETFASTINT (c, CHAR_META | (XINT (c) & ~0x80));
 
-      executing_macro_index++;
+      executing_kbd_macro_index++;
 
       goto from_macro;
     }
@@ -9886,7 +9886,7 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_
 
   /* If enabled, show which key runs this command.  */
   if (!NILP (Vsuggest_key_bindings)
-      && NILP (Vexecuting_macro)
+      && NILP (Vexecuting_kbd_macro)
       && SYMBOLP (function))
     bindings = Fwhere_is_internal (function, Voverriding_local_map,
                                    Qt, Qnil, Qnil);
diff --git a/src/mac.c b/src/mac.c
index e9930ada151..14257fdee94 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -27,6 +27,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "lisp.h"
 #include "process.h"
+#undef init_process
 #include "systime.h"
 #include "sysselect.h"
 #include "blockinput.h"
diff --git a/src/macros.c b/src/macros.c
index 09ae87b0a59..8b17c9fb261 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -31,25 +31,25 @@ Lisp_Object Qexecute_kbd_macro, Qkbd_macro_termination_hook;
 
 /* Kbd macro currently being executed (a string or vector).  */
 
-Lisp_Object Vexecuting_macro;
+Lisp_Object Vexecuting_kbd_macro;
 
 /* Index of next character to fetch from that macro.  */
 
-EMACS_INT executing_macro_index;
+EMACS_INT executing_kbd_macro_index;
 
 /* Number of successful iterations so far
    for innermost keyboard macro.
    This is not bound at each level,
    so after an error, it describes the innermost interrupted macro.  */
 
-int executing_macro_iterations;
+int executing_kbd_macro_iterations;
 
 /* This is the macro that was executing.
    This is not bound at each level,
    so after an error, it describes the innermost interrupted macro.
    We use it only as a kind of flag, so no need to protect it.  */
 
-Lisp_Object executing_macro;
+Lisp_Object executing_kbd_macro;
 
 extern Lisp_Object real_this_command;
 
@@ -114,7 +114,7 @@ macro before appending to it. */)
         }
 
       /* Must convert meta modifier when copying string to vector.  */
-      cvt = STRINGP (current_kboard->Vlast_kbd_macro); 
+      cvt = STRINGP (current_kboard->Vlast_kbd_macro);
       for (i = 0; i < len; i++)
         {
           Lisp_Object c;
@@ -285,17 +285,17 @@ each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
   return Qnil;
 }
 
-/* Restore Vexecuting_macro and executing_macro_index - called when
-   the unwind-protect in Fexecute_kbd_macro gets invoked.  */
+/* Restore Vexecuting_kbd_macro and executing_kbd_macro_index.
+   Called when the unwind-protect in Fexecute_kbd_macro gets invoked.  */
 
 static Lisp_Object
 pop_kbd_macro (info)
      Lisp_Object info;
 {
   Lisp_Object tem;
-  Vexecuting_macro = XCAR (info);
+  Vexecuting_kbd_macro = XCAR (info);
   tem = XCDR (info);
-  executing_macro_index = XINT (XCAR (tem));
+  executing_kbd_macro_index = XINT (XCAR (tem));
   real_this_command = XCDR (tem);
   Frun_hooks (1, &Qkbd_macro_termination_hook);
   return Qnil;
@@ -318,7 +318,7 @@ each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
   struct gcpro gcpro1, gcpro2;
   int success_count = 0;
 
-  executing_macro_iterations = 0;
+  executing_kbd_macro_iterations = 0;
 
   if (!NILP (count))
     {
@@ -330,17 +330,17 @@ each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
   if (!STRINGP (final) && !VECTORP (final))
     error ("Keyboard macros must be strings or vectors");
 
-  tem = Fcons (Vexecuting_macro,
-               Fcons (make_number (executing_macro_index),
+  tem = Fcons (Vexecuting_kbd_macro,
+               Fcons (make_number (executing_kbd_macro_index),
                       real_this_command));
   record_unwind_protect (pop_kbd_macro, tem);
 
   GCPRO2 (final, loopfunc);
   do
     {
-      Vexecuting_macro = final;
-      executing_macro = final;
-      executing_macro_index = 0;
+      Vexecuting_kbd_macro = final;
+      executing_kbd_macro = final;
+      executing_kbd_macro_index = 0;
 
       current_kboard->Vprefix_arg = Qnil;
 
@@ -354,16 +354,16 @@ each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
 
       command_loop_1 ();
 
-      executing_macro_iterations = ++success_count;
+      executing_kbd_macro_iterations = ++success_count;
 
       QUIT;
     }
   while (--repeat
-         && (STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro)));
+         && (STRINGP (Vexecuting_kbd_macro) || VECTORP (Vexecuting_kbd_macro)));
 
-  executing_macro = Qnil;
+  executing_kbd_macro = Qnil;
 
-  real_this_command = Vexecuting_macro;
+  real_this_command = Vexecuting_kbd_macro;
 
   UNGCPRO;
   return unbind_to (pdlcount, Qnil);
@@ -372,8 +372,8 @@ each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
 void
 init_macros ()
 {
-  Vexecuting_macro = Qnil;
-  executing_macro = Qnil;
+  Vexecuting_kbd_macro = Qnil;
+  executing_kbd_macro = Qnil;
 }
 
 void
@@ -396,15 +396,13 @@ syms_of_macros ()
 The value is the symbol `append' while appending to the definition of
 an existing macro.  */);
 
-  DEFVAR_LISP ("executing-macro", &Vexecuting_macro,
-               doc: /* Currently executing keyboard macro (string or vector); nil if none executing.  */);
+  DEFVAR_LISP ("executing-kbd-macro", &Vexecuting_kbd_macro,
+               doc: /* Currently executing keyboard macro (string or vector).
+This is nil when not executing a keyboard macro.  */);
 
-  DEFVAR_INT ("executing-macro-index", &executing_macro_index,
+  DEFVAR_INT ("executing-kbd-macro-index", &executing_kbd_macro_index,
               doc: /* Index in currently executing keyboard macro; undefined if none executing.  */);
 
-  DEFVAR_LISP_NOPRO ("executing-kbd-macro", &Vexecuting_macro,
-                     doc: /* Currently executing keyboard macro (string or vector); nil if none executing.  */);
-
   DEFVAR_KBOARD ("last-kbd-macro", Vlast_kbd_macro,
                  doc: /* Last kbd macro defined, as a string or vector; nil if none defined.  */);
 }
diff --git a/src/macros.h b/src/macros.h
index 41a32efe2e0..bf33ea8325b 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -21,24 +21,24 @@ Boston, MA 02111-1307, USA.  */
 
 /* Kbd macro currently being executed (a string or vector).  */
 
-extern Lisp_Object Vexecuting_macro;
+extern Lisp_Object Vexecuting_kbd_macro;
 
 /* Index of next character to fetch from that macro.  */
 
-extern EMACS_INT executing_macro_index;
+extern EMACS_INT executing_kbd_macro_index;
 
 /* Number of successful iterations so far
    for innermost keyboard macro.
    This is not bound at each level,
    so after an error, it describes the innermost interrupted macro.  */
 
-extern int executing_macro_iterations;
+extern int executing_kbd_macro_iterations;
 
 /* This is the macro that was executing.
    This is not bound at each level,
    so after an error, it describes the innermost interrupted macro.  */
 
-extern Lisp_Object executing_macro;
+extern Lisp_Object executing_kbd_macro;
 
 /* Finish defining the current keyboard macro.  */
 
diff --git a/src/sysselect.h b/src/sysselect.h
index 5aa9eb4aee7..4c52bba677a 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -18,7 +18,7 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#ifdef HAVE_SYS_SELECT
+#ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 288b6356b49..92e85dd8786 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -612,12 +612,6 @@ Lisp_Object Qmessage_truncate_lines;
 
 static int message_cleared_p;
 
-/* Non-zero means we want a hollow cursor in windows that are not
-   selected.  Zero means there's no cursor in such windows.  */
-
-Lisp_Object Vcursor_in_non_selected_windows;
-Lisp_Object Qcursor_in_non_selected_windows;
-
 /* How to blink the default frame cursor off.  */
 Lisp_Object Vblink_cursor_alist;
 
@@ -5864,6 +5858,16 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
     {
       int x, i, ascent = 0, descent = 0;
 
+      /* Stop if we move beyond TO_CHARPOS (after an image or stretch glyph).  */
+      if ((op & MOVE_TO_POS) != 0
+          && BUFFERP (it->object)
+          && it->method == GET_FROM_BUFFER
+          && IT_CHARPOS (*it) > to_charpos)
+        {
+          result = MOVE_POS_MATCH_OR_ZV;
+          break;
+        }
+
       /* Stop when ZV reached.
          We used to stop here when TO_CHARPOS reached as well, but that is
          too soon if this glyph does not fit on this line.  So we handle it
@@ -20131,7 +20135,7 @@ get_window_cursor_type (w, glyph, width, active_cursor)
   /* Use cursor-in-non-selected-windows for non-selected window or frame.  */
   if (non_selected)
     {
-      alt_cursor = Fbuffer_local_value (Qcursor_in_non_selected_windows, w->buffer);
+      alt_cursor = XBUFFER (w->buffer)->cursor_in_non_selected_windows;
       return get_specified_cursor_type (alt_cursor, width);
     }
 
@@ -22496,8 +22500,6 @@ syms_of_xdisp ()
   staticpro (&Qpoly);
   Qmessage_truncate_lines = intern ("message-truncate-lines");
   staticpro (&Qmessage_truncate_lines);
-  Qcursor_in_non_selected_windows = intern ("cursor-in-non-selected-windows");
-  staticpro (&Qcursor_in_non_selected_windows);
   Qgrow_only = intern ("grow-only");
   staticpro (&Qgrow_only);
   Qinhibit_menubar_update = intern ("inhibit-menubar-update");
@@ -22791,12 +22793,6 @@ only, until their display becomes empty, at which point the windows
 go back to their normal size.  */);
   Vresize_mini_windows = Qgrow_only;
 
-  DEFVAR_LISP ("cursor-in-non-selected-windows",
-               &Vcursor_in_non_selected_windows,
-    doc: /* *Cursor type to display in non-selected windows.
-t means to use hollow box cursor.  See `cursor-type' for other values.  */);
-  Vcursor_in_non_selected_windows = Qt;
-
   DEFVAR_LISP ("blink-cursor-alist", &Vblink_cursor_alist,
     doc: /* Alist specifying how to blink the cursor off.
 Each element has the form (ON-STATE . OFF-STATE).  Whenever the
diff --git a/src/xmenu.c b/src/xmenu.c
index f32074c2f6a..1a2386fe916 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -737,7 +737,7 @@ DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0,
 POSITION is a position specification.  This is either a mouse button event
 or a list ((XOFFSET YOFFSET) WINDOW)
 where XOFFSET and YOFFSET are positions in pixels from the top left
-corner of WINDOW's frame.  (WINDOW may be a frame object instead of a window.)
+corner of WINDOW.  (WINDOW may be a window or a frame object.)
 This controls the position of the top left of the menu as a whole.
 If POSITION is t, it means to use the current mouse position.
 
@@ -752,8 +752,11 @@ Otherwise, REAL-DEFINITION should be a valid key binding definition.
 
 You can also use a list of keymaps as MENU.
   Then each keymap makes a separate pane.
-When MENU is a keymap or a list of keymaps, the return value
-is a list of events.
+
+When MENU is a keymap or a list of keymaps, the return value is the
+list of events corresponding to the user's choice. Note that
+`x-popup-menu' does not actually execute the command bound to that
+sequence of events.
 
 Alternatively, you can specify a menu of multiple panes
   with a list of the form (TITLE PANE1 PANE2...),
@@ -764,7 +767,14 @@ in the menu.
 With this form of menu, the return value is VALUE from the chosen item.
 
 If POSITION is nil, don't display the menu at all, just precalculate the
-cached information about equivalent key sequences.  */)
+cached information about equivalent key sequences.
+
+If the user gets rid of the menu without making a valid choice, for
+instance by clicking the mouse away from a valid choice or by typing
+keyboard input, then this normally results in a quit and
+`x-popup-menu' does not return.  But if POSITION is a mouse button
+event (indicating that the user invoked the menu with the mouse) then
+no quit occurs and `x-popup-menu' returns nil.  */)
      (position, menu)
      Lisp_Object position, menu;
 {
@@ -1002,7 +1012,11 @@ The return value is VALUE from the chosen item.
 An ITEM may also be just a string--that makes a nonselectable item.
 An ITEM may also be nil--that means to put all preceding items
 on the left of the dialog box and all following items on the right.
-\(By default, approximately half appear on each side.)  */)
+\(By default, approximately half appear on each side.)
+
+If the user gets rid of the dialog box without making a valid choice,
+for instance using the window manager, then this produces a quit and
+`x-popup-dialog' does not return.  */)
      (position, contents)
      Lisp_Object position, contents;
 {
@@ -2889,6 +2903,9 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
             }
         }
     }
+  else if (!for_click)
+    /* Make "Cancel" equivalent to C-g.  */
+    Fsignal (Qquit, Qnil);
 
   return Qnil;
 }
@@ -3519,8 +3536,8 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
       entry = Qnil;
       break;
     case XM_NO_SELECT:
-      /* Make "Cancel" equivalent to C-g unless this menu was popped up by
-         a mouse press.  */
+      /* Make "Cancel" equivalent to C-g unless FOR_CLICK (which means
+         the menu was invoked with a mouse event as POSITION).  */
       if (! for_click)
         Fsignal (Qquit, Qnil);
       entry = Qnil;