Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-23

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0  (patch 150-165)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Add info/dir to arch branch

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 34-37)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

22 files changed, 451 insertions, 158 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index eb0a3d0cf3b..34ef6c228bb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,132 @@
+2005-03-08  Kenichi Handa  <handa@m17n.org>
+
+        * frame.c (x_set_font): Call set_default_ascii_font if an
+        available font is found.
+
+        * fontset.c (set_default_ascii_font): New function.
+        (syms_of_fontset): Don't set FONTSET_ASCII (Vdefault_fontset)
+        here.
+
+        * fontset.h (set_default_ascii_font): Extern it.
+
+2005-03-07  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (CLEAR_IMAGE_CACHE_COUNT): New const.
+        (clear_image_cache_count): New var.
+        (redisplay_internal): Don't clear face and image caches in the
+        middle of redisplay; do it afterwards.
+
+        * blockinput.h (TOTALLY_UNBLOCK_INPUT): Avoid dangling else.
+
+        * xdisp.c (notice_overwritten_cursor): Check that phys_cursor.vpos
+        is valid.  If not, clear phys_cursor_on_p and return.
+
+2005-03-07  Andreas Schwab  <schwab@suse.de>
+
+        * blockinput.h (UNBLOCK_INPUT_TO): Always call UNBLOCK_INPUT.
+
+2005-03-06  Richard M. Stallman  <rms@gnu.org>
+
+        * keyboard.c (Ftop_level): Let Fthrow deal with UNBLOCK_INPUT.
+
+        * eval.c (unwind_to_catch): Use UNBLOCK_INPUT_TO.
+        (Feval, Ffuncall): Use CHECK_CONS_LIST.
+
+        * lisp.h (CHECK_CONS_LIST): New macro (two definitions).
+
+        * blockinput.h (UNBLOCK_INPUT_TO): New macro.
+        (TOTALLY_UNBLOCK_INPUT): Handle a pending signal if any.
+
+2005-03-05  Juri Linkov  <juri@jurta.org>
+
+        * emacs.c (USAGE1): Replace Info node name "command arguments"
+        with "emacs invocation".
+        (USAGE3): Fix usage of `--color=MODE' which actually doesn't
+        allow arguments `--color' and `MODE' to be separated by space.
+        Add --no-blinking-cursor, -nbc.
+        (standard_args): Add -nbc, --no-blinking-cursor.
+
+2005-03-04  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * s/vms.h: Define NO_HYPHENS_IN_FILENAMES.
+        * s/vms4-4.h, s/vms5-5.h: Undefine NO_HYPHENS_IN_FILENAMES.
+        * fileio.c (Fexpand_file_name) [VMS]:
+        Use NO_HYPHENS_IN_FILENAMES, not VMS4_4.
+        * doc.c (munge_doc_file_name) [VMS]: Likewise.
+        (Fsnarf_documentation): Call munge_doc_file_name.
+
+2005-03-04  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * s/vms.h (FILE_SYSTEM_CASE): New macro.
+        * fileio.c (Fexpand_file_name) [VMS]: Don't upcase the name
+        "manually"; this is now handled generally via FILE_SYSTEM_CASE.
+
+2005-03-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * emacs.c (main): Change `#ifdef HAVE_CARBON' to `#if
+        defined (MAC_OSX) && defined (HAVE_CARBON)'.
+
+        * image.c [!MAC_OSX && TARGET_API_MAC_CARBON]: Include
+        QuickTime.h.
+
+        * mac.c [!MAC_OSX && HAVE_CARBON]: Include Carbon.h.
+        [!MAC_OSX] (select) [TARGET_API_MAC_CARBON]: Use ReceiveNextEvent.
+        (posix_pathname_to_fsspec, fsspec_to_posix_pathname): New
+        functions.
+        (mac_clear_font_name_table): Move extern to macterm.h.
+
+        * macfns.c (install_window_handler): Move extern to macterm.h.
+        (Fx_file_dialog): Check STRINGP (default_filename) to see it is
+        valid.  Don't check !NILP (dir) because it is already checked with
+        CHECK_STRING.
+        (Fx_file_dialog) [!MAC_OSX]: Use FSSpec instead of FSRef for
+        specifying the default location and obtaining the selected
+        filename.
+
+        * macgui.h [!MAC_OSX && HAVE_CARBON]: Include Carbon.h.
+
+        * macmenu.c [TARGET_API_MAC_CARBON]: Don't include headers that
+        are included via Carbon.h.
+
+        * macterm.c [TARGET_API_MAC_CARBON && !MAC_OSX]: Define
+        USE_CARBON_EVENTS to 1.
+        (qd) [__MRC__ && TARGET_API_MAC_CARBON]: Don't declare.
+        (x_free_frame_resources): Call remove_window_handler for
+        non-tooltip windows.
+        [TARGET_API_MAC_CARBON]: Don't include headers that are included
+        via Carbon.h.
+        [TARGET_API_MAC_CARBON] (mac_do_track_dragUPP)
+        (mac_do_receive_dragUPP): New variables.
+        (mac_handle_service_event, init_service_handler): Put declarations
+        and definitions in #ifdef MAC_OSX.
+        (install_window_handler) [TARGET_API_MAC_CARBON]: Create UPPs for
+        drag-and-drop handler functions and register them.
+        (remove_window_handler): New function.
+        (do_ae_open_documents, mac_do_receive_drag) [!MAC_OSX]: Use
+        fsspec_to_posix_pathname.
+        (main): Change #if !TARGET_API_MAC_CARBON to #ifdef MAC_OS8.
+        (XTread_socket) [!MAC_OSX]: Don't pass keyboard events to TSM.
+        [MAC_OS8] (make_mac_terminal_frame) [TARGET_API_MAC_CARBON]: Set
+        default cursors.
+        (mac_initialize) [USE_CARBON_EVENTS && !MAC_OSX] : Don't call
+        init_service_handler or init_quit_char_handler.
+        (mac_initialize) [!MAC_OSX]: Don't call MakeMeTheFrontProcess.
+
+        * macterm.h (install_window_handler, remove_window_handler)
+        (posix_pathname_to_fsspec, fsspec_to_posix_pathname)
+        (mac_clear_font_name_table): New externs.
+
+2005-03-03  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * fileio.c (FILE_SYSTEM_CASE): Define macro if not already defined.
+        (Ffile_name_directory): Use FILE_SYSTEM_CASE unconditionally.
+        (Fexpand_file_name): Likewise.
+
+2005-03-03  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * emacs.c (Fkill_emacs): Use EXIT_SUCCESS;
+        no longer special-case VMS.  Add bogus return value.
+
 2005-03-02  Kim F. Storm  <storm@cua.dk>
 
         * dispextern.h (XASSERTS): Define to 0 if not already defined.
@@ -17,6 +146,11 @@
 
         * keyboard.c (Fposn_at_x_y): Check integerness of X and Y.
 
+2005-02-27  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (fast_find_position): Rename END to BEG.
+        (syms_of_xdisp) <menu-bar-update-hook>: Doc fix.
+
 2005-02-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * gtkutil.c (xg_resize_outer_widget): Remove unneeded call to
@@ -777,7 +911,7 @@
         [TARGET_API_MAC_CARBON] (mac_do_track_drag): Likewise.
         Reject only when there are no filename items.  Set background color
         before (un)highlighting the window below the dragged items.
-        (XTread_socket) [!USE_CARBON_EVENTS]: Don't call do_window_update.
+        (XTread_socket) [USE_CARBON_EVENTS]: Don't call do_window_update.
 
 2005-01-05  Romain Francoise  <romain@orebokech.com>
 
diff --git a/src/blockinput.h b/src/blockinput.h
index a4c8a9b9c22..6aa865ea9be 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -94,7 +94,28 @@ extern int pending_atimers;
     }                                           \
   while (0)
 
-#define TOTALLY_UNBLOCK_INPUT (interrupt_input_blocked = 0)
+/* Undo any number of BLOCK_INPUT calls,
+   and also reinvoke any pending signal.  */
+
+#define TOTALLY_UNBLOCK_INPUT                   \
+  do if (interrupt_input_blocked != 0)          \
+    {                                           \
+      interrupt_input_blocked = 1;              \
+      UNBLOCK_INPUT;                            \
+    }                                           \
+  while (0)
+
+/* Undo any number of BLOCK_INPUT calls down to level LEVEL,
+   and also (if the level is now 0) reinvoke any pending signal.  */
+
+#define UNBLOCK_INPUT_TO(LEVEL)                         \
+  do                                                    \
+    {                                                   \
+      interrupt_input_blocked = (LEVEL) + 1;            \
+      UNBLOCK_INPUT;                                    \
+    }                                                   \
+  while (0)
+
 #define UNBLOCK_INPUT_RESIGNAL UNBLOCK_INPUT
 
 /* In critical section ? */
diff --git a/src/doc.c b/src/doc.c
index e1012b97198..b4ae05ca6c4 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -58,26 +58,24 @@ static Lisp_Object Vbuild_files;
 extern Lisp_Object Voverriding_local_map;
 
 /* For VMS versions with limited file name syntax,
-   convert the name to something VMS will allow. */
+   convert the name to something VMS will allow.  */
 static void
 munge_doc_file_name (name)
      char *name;
 {
 #ifdef VMS
-#ifndef VMS4_4
-  /* For VMS versions with limited file name syntax,
-     convert the name to something VMS will allow.  */
-  p = name;
+#ifndef NO_HYPHENS_IN_FILENAMES
+  extern char * sys_translate_unix (char *ufile);
+  strcpy (name, sys_translate_unix (name));
+#else /* NO_HYPHENS_IN_FILENAMES */
+  char *p = name;
   while (*p)
     {
       if (*p == '-')
         *p = '_';
       p++;
     }
-#endif /* not VMS4_4 */
-#ifdef VMS4_4
-  strcpy (name, sys_translate_unix (name));
-#endif /* VMS4_4 */
+#endif /* NO_HYPHENS_IN_FILENAMES */
 #endif /* VMS */
 }
 
@@ -607,21 +605,7 @@ the same file name is found in the `doc-directory'.  */)
       strcpy (name, SDATA (Vdoc_directory));
     }
   strcat (name, SDATA (filename));      /*** Add this line ***/
-#ifdef VMS
-#ifndef VMS4_4
-  /* For VMS versions with limited file name syntax,
-     convert the name to something VMS will allow.  */
-  p = name;
-  while (*p)
-    {
-      if (*p == '-')
-        *p = '_';
-      p++;
-    }
-#else /* VMS4_4 */
-  strcpy (name, sys_translate_unix (name));
-#endif /* VMS4_4 */
-#endif /* VMS */
+  munge_doc_file_name (name);
 
   /* Vbuild_files is nil when temacs is run, and non-nil after that.  */
   if (NILP (Vbuild_files))
diff --git a/src/emacs.c b/src/emacs.c
index 300f8ef6858..50c95896b4f 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -250,7 +250,7 @@ Run Emacs, the extensible, customizable, self-documenting real-time\n\
 display editor.  The recommended way to start Emacs for normal editing\n\
 is with no options at all.\n\
 \n\
-Run M-x info RET m emacs RET m command arguments RET inside Emacs to\n\
+Run M-x info RET m emacs RET m emacs invocation RET inside Emacs to\n\
 read the main documentation for these command-line arguments.\n\
 \n\
 Initialization options:\n\
@@ -296,7 +296,7 @@ Display options:\n\
 --background-color, -bg COLOR   window background color\n\
 --border-color, -bd COLOR       main border color\n\
 --border-width, -bw WIDTH       width of main border\n\
---color MODE                    color mode for character terminals;\n\
+--color, --color=MODE           color mode for character terminals;\n\
                                   MODE defaults to `auto', and can also\n\
                                   be `never', `auto', `always',\n\
                                   or a mode name like `ansi8'\n\
@@ -313,6 +313,7 @@ Display options:\n\
 --line-spacing, -lsp PIXELS     additional space to put between lines\n\
 --mouse-color, -ms COLOR        mouse cursor color in Emacs window\n\
 --name NAME                     title for initial Emacs frame\n\
+--no-blinking-cursor, -nbc      disable blinking cursor\n\
 --reverse-video, -r, -rv        switch foreground and background\n\
 --title, -T TITLE               title for initial Emacs frame\n\
 --vertical-scroll-bars, -vb     enable vertical scroll bars\n\
@@ -1486,7 +1487,7 @@ main (argc, argv
   init_ntproc ();       /* must precede init_editfns.  */
 #endif
 
-#ifdef HAVE_CARBON
+#if defined (MAC_OSX) && defined (HAVE_CARBON)
   if (initialized)
     init_mac_osx_environment ();
 #endif
@@ -1632,12 +1633,12 @@ main (argc, argv
       syms_of_fontset ();
 #endif /* HAVE_NTGUI */
 
-#ifdef HAVE_CARBON
+#if defined (MAC_OSX) && defined (HAVE_CARBON)
       syms_of_macterm ();
       syms_of_macfns ();
       syms_of_macmenu ();
       syms_of_fontset ();
-#endif /* HAVE_CARBON */
+#endif /* MAC_OSX && HAVE_CARBON */
 
 #ifdef SYMS_SYSTEM
       SYMS_SYSTEM;
@@ -1832,6 +1833,7 @@ struct standard_args standard_args[] =
   { "-ib", "--internal-border", 10, 1 },
   { "-ms", "--mouse-color", 10, 1 },
   { "-cr", "--cursor-color", 10, 1 },
+  { "-nbc", "--no-blinking-cursor", 10, 0 },
   { "-fn", "--font", 10, 1 },
   { "-font", 0, 10, 1 },
   { "-fs", "--fullscreen", 10, 0 },
@@ -2060,14 +2062,9 @@ all of which are called before Emacs is actually killed.  */)
   if (STRINGP (Vauto_save_list_file_name))
     unlink (SDATA (Vauto_save_list_file_name));
 
-  exit (INTEGERP (arg) ? XINT (arg)
-#ifdef VMS
-        : 1
-#else
-        : 0
-#endif
-        );
+  exit (INTEGERP (arg) ? XINT (arg) : EXIT_SUCCESS);
   /* NOTREACHED */
+  return 0;
 }
 
 
diff --git a/src/eval.c b/src/eval.c
index 83e16360473..bf4fec4f8a1 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1176,7 +1176,7 @@ unwind_to_catch (catch, value)
 
   /* Restore certain special C variables.  */
   set_poll_suppress_count (catch->poll_suppress_count);
-  interrupt_input_blocked = catch->interrupt_input_blocked;
+  UNBLOCK_INPUT_TO (catch->interrupt_input_blocked);
   handling_signal = 0;
   immediate_quit = 0;
 
@@ -2067,6 +2067,8 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
       args_left = original_args;
       numargs = Flength (args_left);
 
+      CHECK_CONS_LIST ();
+
       if (XINT (numargs) < XSUBR (fun)->min_args ||
           (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args < XINT (numargs)))
         return Fsignal (Qwrong_number_of_arguments, Fcons (fun, Fcons (numargs, Qnil)));
@@ -2190,6 +2192,8 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
         return Fsignal (Qinvalid_function, Fcons (fun, Qnil));
     }
  done:
+  CHECK_CONS_LIST ();
+
   lisp_eval_depth--;
   if (backtrace.debug_on_exit)
     val = call_debugger (Fcons (Qexit, Fcons (val, Qnil)));
@@ -2746,6 +2750,8 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
 
   if (SUBRP (fun))
     {
+      CHECK_CONS_LIST ();
+
       if (numargs < XSUBR (fun)->min_args
           || (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args < numargs))
         {
@@ -2844,6 +2850,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
         return Fsignal (Qinvalid_function, Fcons (fun, Qnil));
     }
  done:
+  CHECK_CONS_LIST ();
   lisp_eval_depth--;
   if (backtrace.debug_on_exit)
     val = call_debugger (Fcons (Qexit, Fcons (val, Qnil)));
diff --git a/src/fileio.c b/src/fileio.c
index c21cdcec675..db511aad887 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -148,6 +148,10 @@ extern int use_file_dialog;
 #  define lstat stat
 #endif
 
+#ifndef FILE_SYSTEM_CASE
+#define FILE_SYSTEM_CASE(filename)  (filename)
+#endif
+
 /* Nonzero during writing of auto-save files */
 int auto_saving;
 
@@ -417,9 +421,7 @@ on VMS, perhaps instead a string ending in `:', `]' or `>'.  */)
   if (!NILP (handler))
     return call2 (handler, Qfile_name_directory, filename);
 
-#ifdef FILE_SYSTEM_CASE
   filename = FILE_SYSTEM_CASE (filename);
-#endif
   beg = SDATA (filename);
 #ifdef DOS_NT
   beg = strcpy (alloca (strlen (beg) + 1), beg);
@@ -1124,14 +1126,7 @@ See also the function `substitute-in-file-name'.  */)
       UNGCPRO;
     }
 
-#ifdef VMS
-  /* Filenames on VMS are always upper case.  */
-  name = Fupcase (name);
-#endif
-#ifdef FILE_SYSTEM_CASE
   name = FILE_SYSTEM_CASE (name);
-#endif
-
   nm = SDATA (name);
 
 #ifdef DOS_NT
@@ -1231,23 +1226,23 @@ See also the function `substitute-in-file-name'.  */)
             slash = p;
           }
           if (p[0] == '-')
-#ifndef VMS4_4
-            /* VMS pre V4.4,convert '-'s in filenames. */
+#ifdef NO_HYPHENS_IN_FILENAMES
             if (lbrack == rbrack)
               {
-                if (dots < 2)   /* this is to allow negative version numbers */
+                /* Avoid clobbering negative version numbers.  */
+                if (dots < 2)
                   p[0] = '_';
               }
             else
-#endif /* VMS4_4 */
+#endif /* NO_HYPHENS_IN_FILENAMES */
               if (lbrack > rbrack &&
                   ((p[-1] == '.' || p[-1] == '[' || p[-1] == '<') &&
                    (p[1] == '.' || p[1] == ']' || p[1] == '>')))
                 lose = 1;
-#ifndef VMS4_4
+#ifdef NO_HYPHENS_IN_FILENAMES
               else
                 p[0] = '_';
-#endif /* VMS4_4 */
+#endif /* NO_HYPHENS_IN_FILENAMES */
           /* count open brackets, reset close bracket pointer */
           if (p[0] == '[' || p[0] == '<')
             lbrack++, brack = 0;
@@ -1627,12 +1622,12 @@ See also the function `substitute-in-file-name'.  */)
         }
       else
         {
-#ifndef VMS4_4
+#ifdef NO_HYPHENS_IN_FILENAMES
           if (*p == '-' &&
               o[-1] != '[' && o[-1] != '<' && o[-1] != '.' &&
               p[1] != ']' && p[1] != '>' && p[1] != '.')
             *p = '_';
-#endif /* VMS4_4 */
+#endif /* NO_HYPHENS_IN_FILENAMES */
           *o++ = *p++;
         }
 #else /* not VMS */
@@ -6301,7 +6296,7 @@ and `read-file-name-function'.  */)
     {
        Lisp_Object val1 = double_dollars (val);
        tem = Fsymbol_value (Qfile_name_history);
-       if (history_delete_duplicates) 
+       if (history_delete_duplicates)
          XSETCDR (tem, Fdelete (val1, XCDR(tem)));
        XSETCAR (tem, val1);
     }
diff --git a/src/fontset.c b/src/fontset.c
index 4a1e3be2b61..4c54d636398 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -774,6 +774,23 @@ make_fontset (frame, name, base)
 }
 
 
+/* Set the ASCII font of the default fontset to FONTNAME if that is
+   not yet set.  */
+void
+set_default_ascii_font (fontname)
+     Lisp_Object fontname;
+{
+  if (! CONSP (FONTSET_ASCII (Vdefault_fontset)))
+    {
+      int id = fs_query_fontset (fontname, 2);
+
+      if (id >= 0)
+        fontname = XCDR (FONTSET_ASCII (FONTSET_FROM_ID (id)));
+      FONTSET_ASCII (Vdefault_fontset)
+        = Fcons (make_number (0), fontname);
+    }
+}
+
 
 /********** INTERFACES TO xfaces.c, xfns.c, and dispextern.h **********/
 
@@ -2129,21 +2146,6 @@ syms_of_fontset ()
   FONTSET_ID (Vdefault_fontset) = make_number (0);
   FONTSET_NAME (Vdefault_fontset)
     = build_string ("-*-*-*-*-*-*-*-*-*-*-*-*-fontset-default");
-  {
-    Lisp_Object default_ascii_font;
-
-#if defined (macintosh)
-    default_ascii_font
-      = build_string ("-apple-monaco-medium-r-*--*-120-*-*-*-*-mac-roman");
-#elif defined (WINDOWSNT)
-    default_ascii_font
-      = build_string ("-*-courier new-normal-r-*-*-*-100-*-*-*-*-iso8859-1");
-#else
-    default_ascii_font
-      = build_string ("-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1");
-#endif
-    FONTSET_ASCII (Vdefault_fontset) = default_ascii_font;
-  }
   AREF (Vfontset_table, 0) = Vdefault_fontset;
   next_fontset_id = 1;
 
diff --git a/src/fontset.h b/src/fontset.h
index 3de42977a67..2270d6aa7da 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -204,6 +204,7 @@ extern int face_for_char P_ ((FRAME_PTR, struct face *, int,
                               int, Lisp_Object));
 extern int make_fontset_for_ascii_face P_ ((FRAME_PTR, int, struct face *));
 extern int new_fontset_from_font_name P_ ((Lisp_Object));
+extern void set_default_ascii_font P_ ((Lisp_Object));
 extern struct font_info *fs_load_font P_ ((struct frame *, char *, int));
 extern int fs_query_fontset P_ ((Lisp_Object, int));
 EXFUN (Fquery_fontset, 2);
diff --git a/src/frame.c b/src/frame.c
index 893708b02fc..f719fb935d8 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3084,6 +3084,7 @@ x_set_font (f, arg, oldval)
     error ("The default fontset can't be used for a frame font");
   else if (STRINGP (result))
     {
+      set_default_ascii_font (result);
       if (STRINGP (fontset_name))
         {
           /* Fontset names are built from ASCII font names, so the
diff --git a/src/image.c b/src/image.c
index 9c2f6962b6e..0e48b1d2bcb 100644
--- a/src/image.c
+++ b/src/image.c
@@ -88,15 +88,19 @@ typedef struct w32_bitmap_record Bitmap_Record;
 #include <alloca.h>
 #include <sys/param.h>
 #endif
+#if TARGET_API_MAC_CARBON
 #ifdef MAC_OSX
 #include <QuickTime/QuickTime.h>
-#else /* not MAC_OSX */
+#else  /* not MAC_OSX */
+#include <QuickTime.h>
+#endif  /* not MAC_OSX */
+#else  /* not TARGET_API_MAC_CARBON */
 #include <Windows.h>
 #include <Gestalt.h>
 #include <TextUtils.h>
 #include <ImageCompression.h>
 #include <QuickTimeComponents.h>
-#endif /* not MAC_OSX */
+#endif  /* not TARGET_API_MAC_CARBON */
 
 /* MAC_TODO : Color tables on Mac.  */
 #undef COLOR_TABLE_SUPPORT
diff --git a/src/keyboard.c b/src/keyboard.c
index fbdd768dd3a..525958020af 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1350,11 +1350,6 @@ DEFUN ("top-level", Ftop_level, Stop_level, 0, 0, "",
     cancel_hourglass ();
 #endif
 
-  /* Unblock input if we enter with input blocked.  This may happen if
-     redisplay traps e.g. during tool-bar update with input blocked.  */
-  while (INPUT_BLOCKED_P)
-    UNBLOCK_INPUT;
-
   return Fthrow (Qtop_level, Qnil);
 }
 
diff --git a/src/lisp.h b/src/lisp.h
index 2e82a336a66..2da2fe6c7dd 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -53,6 +53,11 @@ Boston, MA 02111-1307, USA.  */
 
 #endif /* 0 */
 
+#ifdef GC_CHECK_CONS_LIST
+#define CHECK_CONS_LIST() check_cons_list()
+#else
+#define CHECK_CONS_LIST() 0
+#endif
 
 /* These are default choices for the types to use.  */
 #ifdef _LP64
diff --git a/src/mac.c b/src/mac.c
index cce1b858cb3..44d763562b0 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -25,20 +25,8 @@ Boston, MA 02111-1307, USA.  */
 #include <stdio.h>
 #include <errno.h>
 #include <time.h>
-#include <utime.h>
-#include <dirent.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/param.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#if __MWERKS__
-#include <unistd.h>
-#endif
 
+#ifdef HAVE_CARBON
 #ifdef MAC_OSX
 #undef mktime
 #undef DEBUG
@@ -57,7 +45,12 @@ Boston, MA 02111-1307, USA.  */
 #define realloc unexec_realloc
 #undef init_process
 #define init_process emacs_init_process
-#else /* not MAC_OSX */
+#else  /* not MAC_OSX */
+#undef SIGHUP
+#define OLDP2C 1
+#include <Carbon.h>
+#endif  /* not MAC_OSX */
+#else   /* not HAVE_CARBON */
 #include <Files.h>
 #include <MacTypes.h>
 #include <TextUtils.h>
@@ -69,7 +62,24 @@ Boston, MA 02111-1307, USA.  */
 #include <OSA.h>
 #include <AppleScript.h>
 #include <Scrap.h>
-#endif /* not MAC_OSX */
+#include <Events.h>
+#include <Processes.h>
+#include <EPPC.h>
+#endif  /* not HAVE_CARBON */
+
+#include <utime.h>
+#include <dirent.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <pwd.h>
+#include <grp.h>
+#include <sys/param.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#if __MWERKS__
+#include <unistd.h>
+#endif
 
 #include "lisp.h"
 #include "process.h"
@@ -812,8 +822,6 @@ sys_fopen (const char *name, const char *mode)
 }
 
 
-#include <Events.h>
-
 long target_ticks = 0;
 
 #ifdef __MRC__
@@ -856,7 +864,24 @@ select (n,  rfds, wfds, efds, timeout)
   struct timeval *timeout;
 {
 #if TARGET_API_MAC_CARBON
-  return 1;
+  OSErr err;
+  EventTimeout timeout_sec =
+    (timeout
+     ? (EMACS_SECS (*timeout) * kEventDurationSecond
+        + EMACS_USECS (*timeout) * kEventDurationMicrosecond)
+     : kEventDurationForever);
+
+  if (FD_ISSET (0, rfds))
+    {
+      BLOCK_INPUT;
+      err = ReceiveNextEvent (0, NULL, timeout_sec, kEventLeaveInQueue, NULL);
+      UNBLOCK_INPUT;
+      if (err == noErr)
+        return 1;
+      else
+        FD_ZERO (rfds);
+    }
+  return 0;
 #else /* not TARGET_API_MAC_CARBON */
   EventRecord e;
   UInt32 sleep_time = EMACS_SECS (*timeout) * 60 +
@@ -1421,6 +1446,39 @@ path_from_vol_dir_name (char *path, int man_path_len, short vol_ref_num,
   return 1;  /* success */
 }
 
+
+OSErr
+posix_pathname_to_fsspec (ufn, fs)
+     const char *ufn;
+     FSSpec *fs;
+{
+  Str255 mac_pathname;
+
+  if (posix_to_mac_pathname (ufn, mac_pathname, sizeof (mac_pathname)) == 0)
+    return fnfErr;
+  else
+    {
+      c2pstr (mac_pathname);
+      return FSMakeFSSpec (0, 0, mac_pathname, fs);
+    }
+}
+
+OSErr
+fsspec_to_posix_pathname (fs, ufn, ufnbuflen)
+     const FSSpec *fs;
+     char *ufn;
+     int ufnbuflen;
+{
+  char mac_pathname[MAXPATHLEN];
+
+  if (path_from_vol_dir_name (mac_pathname, sizeof (mac_pathname) - 1,
+                              fs->vRefNum, fs->parID, fs->name)
+      && mac_to_posix_pathname (mac_pathname, ufn, ufnbuflen))
+    return noErr;
+  else
+    return fnfErr;
+}
+
 #ifndef MAC_OSX
 
 int
@@ -1899,9 +1957,6 @@ uname (struct utsname *name)
 }
 
 
-#include <Processes.h>
-#include <EPPC.h>
-
 /* Event class of HLE sent to subprocess.  */
 const OSType kEmacsSubprocessSend = 'ESND';
 
@@ -2770,7 +2825,6 @@ and t is the same as `SECONDARY'.  */)
   return Qnil;
 }
 
-extern void mac_clear_font_name_table P_ ((void));
 
 DEFUN ("mac-clear-font-name-table", Fmac_clear_font_name_table, Smac_clear_font_name_table, 0, 0, 0,
        doc: /* Clear the font name table.  */)
diff --git a/src/macfns.c b/src/macfns.c
index e46b8469fe2..1269803153a 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -2294,8 +2294,6 @@ XParseGeometry (string, x, y, width, height)
 
 /* Create and set up the Mac window for frame F.  */
 
-extern OSErr install_window_handler (WindowPtr);
-
 static void
 mac_window (f)
      struct frame *f;
@@ -4356,7 +4354,7 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
         options.actionButtonLabel = CFSTR ("Ok");
         options.windowTitle = CFSTR ("Enter name");
 
-        if (!NILP(default_filename))
+        if (STRINGP (default_filename))
           {
             Lisp_Object utf8 = ENCODE_UTF_8 (default_filename);
             char *begPtr = SDATA(utf8);
@@ -4381,22 +4379,29 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
       }
     
     /* Set the default location and continue*/
-    if (status == noErr) {
-      if (!NILP(dir)) {
-        FSRef defLoc;
+    if (status == noErr)
+      {
         AEDesc defLocAed;
+#ifdef MAC_OSX
+        FSRef defLoc;
         status = FSPathMakeRef(SDATA(ENCODE_FILE(dir)), &defLoc, NULL);
+#else
+        FSSpec defLoc;
+        status = posix_pathname_to_fsspec (SDATA (ENCODE_FILE (dir)), &defLoc);
+#endif
         if (status == noErr) 
           {
+#ifdef MAC_OSX
             AECreateDesc(typeFSRef, &defLoc, sizeof(FSRef), &defLocAed);
+#else
+            AECreateDesc(typeFSS, &defLoc, sizeof(FSSpec), &defLocAed);
+#endif
             NavCustomControl(dialogRef, kNavCtlSetLocation, (void*) &defLocAed);
             AEDisposeDesc(&defLocAed);
           }
+        status = NavDialogRun(dialogRef);
       }
 
-      status = NavDialogRun(dialogRef);
-    }
-
     if (saveName) CFRelease(saveName);
     if (message) CFRelease(message);
 
@@ -4413,11 +4418,22 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
           {
             NavReplyRecord reply;
             AEDesc aed;
+#ifdef MAC_OSX
             FSRef fsRef;
+#else
+            FSSpec fs;
+#endif
             status = NavDialogGetReply(dialogRef, &reply);
+
+#ifdef MAC_OSX
             AECoerceDesc(&reply.selection, typeFSRef, &aed);
             AEGetDescData(&aed, (void *) &fsRef, sizeof (FSRef));
             FSRefMakePath(&fsRef, (UInt8 *) filename, sizeof (filename));
+#else
+            AECoerceDesc (&reply.selection, typeFSS, &aed);
+            AEGetDescData (&aed, (void *) &fs, sizeof (FSSpec));
+            fsspec_to_posix_pathname (&fs, filename, sizeof (filename) - 1);
+#endif
             AEDisposeDesc(&aed);
             if (reply.saveFileName)
               {
diff --git a/src/macgui.h b/src/macgui.h
index cb157bb8c25..6a961318b76 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -29,10 +29,11 @@ typedef char * XrmDatabase;  /* fix later */
 
 typedef unsigned long Time;
 
-#if MAC_OSX
+#ifdef HAVE_CARBON
+#undef Z
+#ifdef MAC_OSX
 #undef mktime
 #undef DEBUG
-#undef Z
 #undef free
 #undef malloc
 #undef realloc
@@ -44,8 +45,6 @@ typedef unsigned long Time;
 #include <Carbon/Carbon.h>
 #undef mktime
 #define mktime emacs_mktime
-#undef Z
-#define Z (current_buffer->text->z)
 #undef free
 #define free unexec_free
 #undef malloc
@@ -59,12 +58,19 @@ typedef unsigned long Time;
 #undef init_process
 #define init_process emacs_init_process
 #undef INFINITY
-#else
+#else  /* not MAC_OSX */
+#undef SIGHUP
+#define OLDP2C 1
+#include <Carbon.h>
+#endif  /* not MAC_OSX */
+#undef Z
+#define Z (current_buffer->text->z)
+#else /* not HAVE_CARBON */
 #include <QuickDraw.h>          /* for WindowPtr */
 #include <QDOffscreen.h>        /* for GWorldPtr */
 #include <Windows.h>
 #include <Gestalt.h>
-#endif
+#endif /* not HAVE_CARBON */
 
 typedef WindowPtr Window;
 typedef GWorldPtr Pixmap;
diff --git a/src/macmenu.c b/src/macmenu.c
index f0696a49774..35615cc3796 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -35,7 +35,7 @@ Boston, MA 02111-1307, USA.  */
 #include "charset.h"
 #include "coding.h"
 
-#ifndef MAC_OSX
+#if !TARGET_API_MAC_CARBON
 #include <MacTypes.h>
 #include <Menus.h>
 #include <QuickDraw.h>
@@ -47,7 +47,7 @@ Boston, MA 02111-1307, USA.  */
 #if defined (__MRC__) || (__MSL__ >= 0x6000)
 #include <ControlDefinitions.h>
 #endif
-#endif /* not MAC_OSX */
+#endif /* not TARGET_API_MAC_CARBON */
 
 /* This may include sys/types.h, and that somehow loses
    if this is not done before the other system files.  */
diff --git a/src/macterm.c b/src/macterm.c
index 2ee881e8d49..43e1999d11d 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -34,12 +34,12 @@ Boston, MA 02111-1307, USA.  */
 #include <alloca.h>
 #endif
 
-#ifdef MAC_OSX
+#if TARGET_API_MAC_CARBON
 /* USE_CARBON_EVENTS determines if the Carbon Event Manager is used to
    obtain events from the event queue.  If set to 0, WaitNextEvent is
    used instead.  */
 #define USE_CARBON_EVENTS 1
-#else /* not MAC_OSX */
+#else /* not TARGET_API_MAC_CARBON */
 #include <Quickdraw.h>
 #include <ToolUtils.h>
 #include <Sound.h>
@@ -58,7 +58,7 @@ Boston, MA 02111-1307, USA.  */
 #if __profile__
 #include <profiler.h>
 #endif
-#endif /* not MAC_OSX */
+#endif /* not TARGET_API_MAC_CARBON */
 
 #include "systty.h"
 #include "systime.h"
@@ -247,7 +247,7 @@ extern XrmDatabase x_load_resources P_ ((Display *, char *, char *, char *));
 
 extern int inhibit_window_system;
 
-#if __MRC__
+#if __MRC__ && !TARGET_API_MAC_CARBON
 QDGlobals qd;  /* QuickDraw global information structure.  */
 #endif
 
@@ -5591,6 +5591,9 @@ x_free_frame_resources (f)
 
   BLOCK_INPUT;
 
+  if (wp != tip_window)
+    remove_window_handler (wp);
+
   DisposeWindow (wp);
   if (wp == tip_window)
     /* Neither WaitNextEvent nor ReceiveNextEvent receives `window
@@ -7104,7 +7107,7 @@ x_find_ccl_program (fontp)
 
 /* The Mac Event loop code */
 
-#ifndef MAC_OSX
+#if !TARGET_API_MAC_CARBON
 #include <Events.h>
 #include <Quickdraw.h>
 #include <Balloons.h>
@@ -7125,7 +7128,7 @@ x_find_ccl_program (fontp)
 #if __MWERKS__
 #include <unix.h>
 #endif
-#endif /* ! MAC_OSX */
+#endif /* ! TARGET_API_MAC_CARBON */
 
 #define M_APPLE 128
 #define I_ABOUT 1
@@ -7226,12 +7229,16 @@ static pascal OSErr do_ae_quit_application (AppleEvent *, AppleEvent *, long);
 /* Drag and Drop */
 static pascal OSErr mac_do_track_drag (DragTrackingMessage, WindowPtr, void*, DragReference);
 static pascal OSErr mac_do_receive_drag (WindowPtr, void*, DragReference);
+static DragTrackingHandlerUPP mac_do_track_dragUPP = NULL;
+static DragReceiveHandlerUPP mac_do_receive_dragUPP = NULL;
 #endif
 
 #if USE_CARBON_EVENTS
+#ifdef MAC_OSX
 /* Preliminary Support for the OSX Services Menu */
 static OSStatus mac_handle_service_event (EventHandlerCallRef,EventRef,void*);
 static void init_service_handler ();
+#endif
 /* Window Event Handler */
 static pascal OSStatus mac_handle_window_event (EventHandlerCallRef,
                                                 EventRef, void *);
@@ -7870,7 +7877,7 @@ init_required_apple_events ()
 }
 
 #if USE_CARBON_EVENTS
-
+#ifdef MAC_OSX
 void
 init_service_handler ()
 {
@@ -7966,7 +7973,7 @@ mac_handle_service_event (EventHandlerCallRef callRef,
     }
   return err;
 }
-
+#endif
 
 static pascal OSStatus
 mac_handle_window_event (next_handler, event, data)
@@ -8063,14 +8070,30 @@ install_window_handler (window)
                                    NULL, NULL);
 #endif
 #if TARGET_API_MAC_CARBON
+  if (mac_do_track_dragUPP == NULL)
+    mac_do_track_dragUPP = NewDragTrackingHandlerUPP (mac_do_track_drag);
+  if (mac_do_receive_dragUPP == NULL)
+    mac_do_receive_dragUPP = NewDragReceiveHandlerUPP (mac_do_receive_drag);
+
   if (err == noErr)
-    err = InstallTrackingHandler (mac_do_track_drag, window, NULL);
+    err = InstallTrackingHandler (mac_do_track_dragUPP, window, NULL);
   if (err == noErr)
-    err = InstallReceiveHandler (mac_do_receive_drag, window, NULL);
+    err = InstallReceiveHandler (mac_do_receive_dragUPP, window, NULL);
 #endif
   return err;
 }
 
+void
+remove_window_handler (window)
+     WindowPtr window;
+{
+#if TARGET_API_MAC_CARBON
+  if (mac_do_track_dragUPP)
+    RemoveTrackingHandler (mac_do_track_dragUPP, window);
+  if (mac_do_receive_dragUPP)
+    RemoveReceiveHandler (mac_do_receive_dragUPP, window);
+#endif
+}
 
 /* Open Application Apple Event */
 static pascal OSErr
@@ -8149,9 +8172,9 @@ do_ae_open_documents(AppleEvent *message, AppleEvent *reply, long refcon)
         /* AE file list is one based so just use that for indexing here.  */
         for (i = 1; i <= num_files_to_open; i++)
           {
+            char unix_path_name[MAXPATHLEN];
 #ifdef MAC_OSX
             FSRef fref;
-            char unix_path_name[MAXPATHLEN];
 
             err = AEGetNthPtr (&the_desc, i, typeFSRef, &keyword,
                                &actual_type, &fref, sizeof (FSRef),
@@ -8163,15 +8186,13 @@ do_ae_open_documents(AppleEvent *message, AppleEvent *reply, long refcon)
                 == noErr)
 #else
             FSSpec fs;
-            Str255 path_name, unix_path_name;
 
             err = AEGetNthPtr(&the_desc, i, typeFSS, &keyword, &actual_type,
                               (Ptr) &fs, sizeof (fs), &actual_size);
             if (err != noErr) continue;
 
-            if (path_from_vol_dir_name (path_name, 255, fs.vRefNum, fs.parID,
-                                        fs.name) &&
-                mac_to_posix_pathname (path_name, unix_path_name, 255))
+            if (fsspec_to_posix_pathname (&fs, unix_path_name,
+                                          sizeof (unix_path_name) - 1) == noErr)
 #endif
               /* x-dnd functions expect undecoded filenames.  */
               drag_and_drop_file_list =
@@ -8290,10 +8311,9 @@ mac_do_receive_drag (WindowPtr window, void *handlerRefCon,
         {
 #ifdef MAC_OSX
           FSRef fref;
-          char unix_path_name[MAXPATHLEN];
-#else
-          Str255 path_name, unix_path_name;
 #endif
+          char unix_path_name[MAXPATHLEN];
+
           GetFlavorData (theDrag, theItem, flavorTypeHFS, &data, &size, 0L);
 #ifdef MAC_OSX
           /* Use Carbon routines, otherwise it converts the file name
@@ -8301,9 +8321,8 @@ mac_do_receive_drag (WindowPtr window, void *handlerRefCon,
           FSpMakeFSRef (&data.fileSpec, &fref);
           if (! FSRefMakePath (&fref, unix_path_name, sizeof (unix_path_name)));
 #else
-          if (path_from_vol_dir_name (path_name, 255, data.fileSpec.vRefNum,
-                                      data.fileSpec.parID, data.fileSpec.name) &&
-              mac_to_posix_pathname (path_name, unix_path_name, 255))
+          if (fsspec_to_posix_pathname (&data.fileSpec, unix_path_name,
+                                        sizeof (unix_path_name) - 1) == noErr)
 #endif
             /* x-dnd functions expect undecoded filenames.  */
             drag_and_drop_file_list =
@@ -8400,7 +8419,7 @@ profiler_exit_proc ()
    hints and prompts in the minibuffer after the user stops typing for
    a wait, etc.  */
 
-#if !TARGET_API_MAC_CARBON
+#ifdef MAC_OS8
 #undef main
 int
 main (void)
@@ -8982,7 +9001,7 @@ XTread_socket (sd, expected, hold_quit)
             int keycode = (er.message & keyCodeMask) >> 8;
             int xkeysym;
 
-#if USE_CARBON_EVENTS
+#if USE_CARBON_EVENTS && defined (MAC_OSX)
             /* When using Carbon Events, we need to pass raw keyboard
                events to the TSM ourselves.  If TSM handles it, it
                will pass back noErr, otherwise it will pass back
@@ -9291,12 +9310,21 @@ make_mac_terminal_frame (struct frame *f)
   f->output_data.mac->mouse_pixel = 0xff00ff;
   f->output_data.mac->cursor_foreground_pixel = 0x0000ff;
 
+#if TARGET_API_MAC_CARBON
+  f->output_data.mac->text_cursor = kThemeIBeamCursor;
+  f->output_data.mac->nontext_cursor = kThemeArrowCursor;
+  f->output_data.mac->modeline_cursor = kThemeArrowCursor;
+  f->output_data.mac->hand_cursor = kThemePointingHandCursor;
+  f->output_data.mac->hourglass_cursor = kThemeWatchCursor;
+  f->output_data.mac->horizontal_drag_cursor = kThemeResizeLeftRightCursor;
+#else
   f->output_data.mac->text_cursor = GetCursor (iBeamCursor);
   f->output_data.mac->nontext_cursor = &arrow_cursor;
   f->output_data.mac->modeline_cursor = &arrow_cursor;
   f->output_data.mac->hand_cursor = &arrow_cursor;
   f->output_data.mac->hourglass_cursor = GetCursor (watchCursor);
   f->output_data.mac->horizontal_drag_cursor = &arrow_cursor;
+#endif
 
   FRAME_FONTSET (f) = -1;
   f->output_data.mac->explicit_parent = 0;
@@ -9831,7 +9859,7 @@ mac_initialize ()
 #if TARGET_API_MAC_CARBON
   init_required_apple_events ();
 
-#if USE_CARBON_EVENTS
+#if USE_CARBON_EVENTS && defined (MAC_OSX)
   init_service_handler ();
 
   init_quit_char_handler ();
@@ -9839,9 +9867,11 @@ mac_initialize ()
 
   DisableMenuCommand (NULL, kHICommandQuit);
 
+#ifdef MAC_OSX
   if (!inhibit_window_system)
     MakeMeTheFrontProcess ();
 #endif
+#endif
   UNBLOCK_INPUT;
 }
 
diff --git a/src/macterm.h b/src/macterm.h
index f32b13000e6..27cd1f49646 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -607,10 +607,17 @@ extern void XSetWindowBackground P_ ((Display *, WindowPtr, unsigned long));
 extern void mac_draw_line_to_pixmap P_ ((Display *, Pixmap, GC, int, int,
                                          int, int));
 extern void mac_unload_font P_ ((struct mac_display_info *, XFontStruct *));
+extern OSErr install_window_handler P_ ((WindowPtr));
+extern void remove_window_handler P_ ((WindowPtr));
 
 #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0
 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0
 
+/* Defined in mac.c.  */
+
+extern OSErr posix_pathname_to_fsspec P_ ((const char *, FSSpec *));
+extern OSErr fsspec_to_posix_pathname P_ ((const FSSpec *, char *, int));
+extern void mac_clear_font_name_table P_ ((void));
 #if TARGET_API_MAC_CARBON
 extern CFStringRef cfstring_create_with_utf8_cstring P_ ((const char *));
 #endif
diff --git a/src/s/vms.h b/src/s/vms.h
index dc7877eaa67..1338cdb5718 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -109,6 +109,11 @@ Boston, MA 02111-1307, USA.  */
    your system and must be used only through an encapsulation
    (Which you should place, by convention, in sysdep.c).  */
 
+/* In olden days, VMS filenames did not support hyphen (i.e., the "-"
+   character).  You can #undef this in vmsX-Y.h for newer versions.  */
+
+#define NO_HYPHENS_IN_FILENAMES
+
 /* Do you have the sharable library bug?  If you link with a sharable
    library that contains psects with the NOSHR attribute and also refer to
    those psects in your program, the linker give you a private version of
@@ -135,6 +140,10 @@ Boston, MA 02111-1307, USA.  */
 
 /* #define READ_SYSUAF */
 
+/* Traditionally, filenames on VMS are always upper case.  */
+
+#define FILE_SYSTEM_CASE Fupcase
+
 /* On VMS these have a different name */
 
 #define index strchr
diff --git a/src/s/vms4-4.h b/src/s/vms4-4.h
index 0abd8259143..7491f5c8f80 100644
--- a/src/s/vms4-4.h
+++ b/src/s/vms4-4.h
@@ -1,5 +1,7 @@
 #include "vms.h"
 #define VMS4_4
 
+#undef NO_HYPHENS_IN_FILENAMES
+
 /* arch-tag: 2e65c7ad-0d17-45a0-b4cb-3e76c72ea9d5
    (do not change this comment) */
diff --git a/src/s/vms5-5.h b/src/s/vms5-5.h
index ac0ba9461a2..83b08b42813 100644
--- a/src/s/vms5-5.h
+++ b/src/s/vms5-5.h
@@ -2,6 +2,8 @@
 #define VMS5_5
 #define VMS4_4
 
+#undef NO_HYPHENS_IN_FILENAMES
+
 /* The bug that SHARABLE_LIB_BUG fixes is gone in version 5.5 of VMS.
    And defining it causes lossage because sys_errlist has a different
    number of elements.  */
diff --git a/src/xdisp.c b/src/xdisp.c
index 463d016381c..3499e95d383 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -784,6 +784,13 @@ enum move_it_result
 #define CLEAR_FACE_CACHE_COUNT  500
 static int clear_face_cache_count;
 
+/* Similarly for the image cache.  */
+
+#ifdef HAVE_WINDOW_SYSTEM
+#define CLEAR_IMAGE_CACHE_COUNT 101
+static int clear_image_cache_count;
+#endif
+
 /* Record the previous terminal frame we displayed.  */
 
 static struct frame *previous_terminal_frame;
@@ -10479,7 +10486,9 @@ redisplay_internal (preserve_echo_area)
   CHARPOS (this_line_start_pos) = 0;
   consider_all_windows_p |= buffer_shared > 1;
   ++clear_face_cache_count;
-
+#ifdef HAVE_WINDOW_SYSTEM
+  ++clear_image_cache_count;
+#endif
 
   /* Build desired matrices, and update the display.  If
      consider_all_windows_p is non-zero, do it for all windows on all
@@ -10492,13 +10501,6 @@ redisplay_internal (preserve_echo_area)
       struct frame **updated
         = (struct frame **) alloca (size * sizeof *updated);
 
-      /* Clear the face cache eventually.  */
-      if (clear_face_cache_count > CLEAR_FACE_CACHE_COUNT)
-        {
-          clear_face_cache (0);
-          clear_face_cache_count = 0;
-        }
-
       /* Recompute # windows showing selected buffer.  This will be
          incremented each time such a window is displayed.  */
       buffer_shared = 0;
@@ -10514,12 +10516,6 @@ redisplay_internal (preserve_echo_area)
                    variables.  */
                 select_frame_for_redisplay (frame);
 
-#ifdef HAVE_WINDOW_SYSTEM
-              if (clear_face_cache_count % 50 == 0
-                  && FRAME_WINDOW_P (f))
-                clear_image_cache (f, 0);
-#endif /* HAVE_WINDOW_SYSTEM */
-
               /* Mark all the scroll bars to be removed; we'll redeem
                  the ones we want when we redisplay their windows.  */
               if (condemn_scroll_bars_hook)
@@ -10723,6 +10719,29 @@ redisplay_internal (preserve_echo_area)
   if (windows_or_buffers_changed && !pause)
     goto retry;
 
+  /* Clear the face cache eventually.  */
+  if (consider_all_windows_p)
+    {
+      if (clear_face_cache_count > CLEAR_FACE_CACHE_COUNT)
+        {
+          clear_face_cache (0);
+          clear_face_cache_count = 0;
+        }
+#ifdef HAVE_WINDOW_SYSTEM
+      if (clear_image_cache_count > CLEAR_IMAGE_CACHE_COUNT)
+        {
+          Lisp_Object tail, frame;
+          FOR_EACH_FRAME (tail, frame)
+            {
+              struct frame *f = XFRAME (frame);
+              if (FRAME_WINDOW_P (f))
+                clear_image_cache (f, 0);
+            }
+          clear_image_cache_count = 0;
+        }
+#endif /* HAVE_WINDOW_SYSTEM */
+    }
+
  end_of_redisplay:
   unbind_to (count, Qnil);
   RESUME_POLLING;
@@ -20350,8 +20369,10 @@ notice_overwritten_cursor (w, area, x0, x1, y0, y1)
   if (area != TEXT_AREA)
     return;
 
-  row = w->current_matrix->rows + w->phys_cursor.vpos;
-  if (!row->displays_text_p)
+  if (w->phys_cursor.vpos < 0
+      || w->phys_cursor.vpos >= w->current_matrix->nrows
+      || (row = w->current_matrix->rows + w->phys_cursor.vpos,
+          !(row->enabled_p && row->displays_text_p)))
     return;
 
   if (row->cursor_in_fringe_p)