17 files changed, 382 insertions, 153 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 56833a341a4..dc48d647216 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,115 @@
+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.
+        (xassert) [!XASSERTS]: Define dummy version.
+
+2005-03-02  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (redisplay_window): YABX (yet another bogus xassert).
+        Reported by David Kastrup.
+
+2005-03-01  Ehud Karni  <ehud@unix.mvs.co.il>
+
+        * xdisp.c (get_next_display_element): Fix control and escape
+        glyph from display vector.
+
+2005-03-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c (Fposn_at_x_y): Check integerness of X and Y.
+
 2005-02-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
-        * gtkutil.c (xg_resize_outer_widget): Removed unneeded call to
+        * gtkutil.c (xg_resize_outer_widget): Remove unneeded call to
         gtk_window_resize and x_wm_set_size_hint.
 
 2005-02-25  Kim F. Storm  <storm@cua.dk>
@@ -30,7 +139,7 @@
         * window.c (window_scroll_pixel_based): When scrolling backwards,
         handle partial visible line at end of window even when we hit PT.
 
-2005-02-21  Stefan  <monnier@iro.umontreal.ca>
+2005-02-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * keymap.h: Declare Fcurrent_active_maps, used in doc.c.
 
@@ -88,8 +197,7 @@
         (Fx_window_property): Likewise.
 
         * xselect.c (Fx_disown_selection_internal): Use union of struct
-        input_event and struct selection_input_event to avoid aliasing
-        issues.
+        input_event and struct selection_input_event to avoid aliasing issues.
 
         * xterm.c (handle_one_xevent): Use union of struct input_event and
         struct selection_input_event to avoid aliasing issues.
@@ -118,21 +226,20 @@
         clipboard operations and delayed rendering.
 
         Drop last_clipboard_text and related code, keep track of
-        ownership via clipboard_owner instead.  Drop old #if0
-        sections.
+        ownership via clipboard_owner instead.  Drop old #if0 sections.
 
         (DEFAULT_LCID, ANSICP, OEMCP, QUNICODE, QANSICP, QOEMCP)
         (clipboard_owner, modifying_clipboard, cfg_coding_system)
         (cfg_codepage, cfg_lcid, cfg_clipboard_type, current_text)
         (current_coding_system, current_requires_encoding)
-        (current_num_nls, current_clipboard_type, current_lcid): New
-        static variables.
+        (current_num_nls, current_clipboard_type, current_lcid):
+        New static variables.
 
         (convert_to_handle_as_ascii, convert_to_handle_as_coded)
         (render, render_all, run_protected, lisp_error_handler)
         (owner_callback, create_owner, setup_config)
-        (enum_locale_callback, cp_from_locale, coding_from_cp): New
-        local functions.
+        (enum_locale_callback, cp_from_locale, coding_from_cp):
+        New local functions.
 
         (term_w32select, globals_of_w32select): New global functions.
 
@@ -332,8 +439,7 @@
         (casify_region): Fix loop condition, args to replace_range_2, and
         update opoint_byte.
 
-        * insdel.c (replace_range_2): Fix bugs in adjusting markers and
-        point.
+        * insdel.c (replace_range_2): Fix bugs in adjusting markers and point.
 
 2005-02-01  Kim F. Storm  <storm@cua.dk>
 
@@ -761,7 +867,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>
 
@@ -11015,9 +11121,9 @@
         These changes were in part based upon suggestions made by Peter
         'Luna' Runestig [peter@runestig.com].
 
-        * w32.c (g_b_init_is_windows_9x, g_b_init_open_process_token,
-        g_b_init_get_token_information, g_b_init_lookup_account_sid,
-        g_b_init_get_sid_identifier_authority ): Add several static
+        * w32.c (g_b_init_is_windows_9x, g_b_init_open_process_token)
+        (g_b_init_get_token_information, g_b_init_lookup_account_sid)
+        (g_b_init_get_sid_identifier_authority ): Add several static
         global variables.
 
         * w32.c (globals_of_w32): New function.  Used to initialize those
diff --git a/src/dispextern.h b/src/dispextern.h
index 5401fecedd5..60f24feef5b 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -119,6 +119,13 @@ enum window_part
 #define GLYPH_DEBUG 0
 #endif
 
+/* If XASSERTS is non-zero, additional consistency checks are activated.
+   Turn it off by defining the macro XASSERTS to zero.  */
+
+#ifndef XASSERTS
+#define XASSERTS 0
+#endif
+
 /* Macros to include code only if GLYPH_DEBUG != 0.  */
 
 #if GLYPH_DEBUG
@@ -127,8 +134,11 @@ enum window_part
 #define IF_DEBUG(X)     (void) 0
 #endif
 
-/* Maybe move this inside the above `#ifdef GLYPH_DEBUG' for release.  */
+#if XASSERTS
 #define xassert(X)      do {if (!(X)) abort ();} while (0)
+#else
+#define xassert(X)      (void) 0
+#endif
 
 /* Macro for displaying traces of redisplay.  If Emacs was compiled
    with GLYPH_DEBUG != 0, the variable trace_redisplay_p can be set to
diff --git a/src/doc.c b/src/doc.c
index 0d1ab394647..d3e58f4b6cb 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 159a162d649..d83adc989eb 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -251,7 +251,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\
@@ -297,7 +297,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\
@@ -314,6 +314,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\
@@ -1483,7 +1484,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
@@ -1627,12 +1628,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;
@@ -1824,6 +1825,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 },
@@ -2052,14 +2054,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/fileio.c b/src/fileio.c
index 12360c677f8..3212c51d096 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -150,6 +150,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;
 
@@ -415,9 +419,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);
@@ -1122,14 +1124,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
@@ -1229,23 +1224,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;
@@ -1625,12 +1620,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 */
@@ -6387,7 +6382,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/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 42255dfbd91..3da16b82271 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1,6 +1,6 @@
 /* Keyboard and mouse input; editor command loop.
-   Copyright (C) 1985,86,87,88,89,93,94,95,96,97,99,2000,01,02,03,04
-     Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997,
+     1999, 2000, 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -10660,6 +10660,9 @@ The `posn-' functions access elements of such lists.  */)
   (x, y, frame_or_window, whole)
      Lisp_Object x, y, frame_or_window, whole;
 {
+  CHECK_NATNUM (x);
+  CHECK_NATNUM (y);
+
   if (NILP (frame_or_window))
     frame_or_window = selected_window;
 
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 26d63ec99af..d90344dc1d0 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 21effb23cfa..a98d4ae5eb4 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"
@@ -245,7 +245,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
 
@@ -5574,6 +5574,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
@@ -7078,7 +7081,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>
@@ -7099,7 +7102,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
@@ -7200,12 +7203,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 *);
@@ -7844,7 +7851,7 @@ init_required_apple_events ()
 }
 
 #if USE_CARBON_EVENTS
-
+#ifdef MAC_OSX
 void
 init_service_handler ()
 {
@@ -7940,7 +7947,7 @@ mac_handle_service_event (EventHandlerCallRef callRef,
     }
   return err;
 }
-
+#endif
 
 static pascal OSStatus
 mac_handle_window_event (next_handler, event, data)
@@ -8037,14 +8044,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
@@ -8123,9 +8146,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),
@@ -8137,15 +8160,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 =
@@ -8264,10 +8285,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
@@ -8275,9 +8295,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 =
@@ -8374,7 +8393,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)
@@ -8956,7 +8975,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
@@ -9265,12 +9284,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;
@@ -9806,7 +9834,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 ();
@@ -9814,9 +9842,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 c1aa61e962b..42d79eb3577 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -604,10 +604,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 5e17a7e3ca5..2b69e885954 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5083,11 +5083,12 @@ get_next_display_element (it)
                  display.  Then, set IT->dpvec to these glyphs.  */
               GLYPH g;
               int ctl_len;
-              int face_id, lface_id;
+              int face_id, lface_id = 0 ;
               GLYPH escape_glyph;
 
               if (it->c < 128 && it->ctl_arrow_p)
                 {
+                  g = '^';           /* default glyph for Control */
                   /* Set IT->ctl_chars[0] to the glyph for `^'.  */
                   if (it->dp
                       && INTEGERP (DISP_CTRL_GLYPH (it->dp))
@@ -5095,19 +5096,18 @@ get_next_display_element (it)
                     {
                       g = XINT (DISP_CTRL_GLYPH (it->dp));
                       lface_id = FAST_GLYPH_FACE (g);
-                      if (lface_id)
-                        {
-                          g = FAST_GLYPH_CHAR (g);
-                          face_id = merge_faces (it->f, Qt, lface_id,
-                                                 it->face_id);
-                        }
+                    }
+                  if (lface_id)
+                    {
+                       g = FAST_GLYPH_CHAR (g);
+                       face_id = merge_faces (it->f, Qt, lface_id,
+                                              it->face_id);
                     }
                   else
                     {
                       /* Merge the escape-glyph face into the current face.  */
                       face_id = merge_faces (it->f, Qescape_glyph, 0,
                                              it->face_id);
-                      g = '^';
                     }
 
                   XSETINT (it->ctl_chars[0], g);
@@ -5117,25 +5117,25 @@ get_next_display_element (it)
                   goto display_control;
                 }
 
+              escape_glyph = '\\';    /* default for Octal display */
               if (it->dp
                   && INTEGERP (DISP_ESCAPE_GLYPH (it->dp))
                   && GLYPH_CHAR_VALID_P (XFASTINT (DISP_ESCAPE_GLYPH (it->dp))))
                 {
                   escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp));
                   lface_id = FAST_GLYPH_FACE (escape_glyph);
-                  if (lface_id)
-                    {
-                      escape_glyph = FAST_GLYPH_CHAR (escape_glyph);
-                      face_id = merge_faces (it->f, Qt, lface_id,
-                                             it->face_id);
-                    }
+                }
+              if (lface_id)
+                {
+                  escape_glyph = FAST_GLYPH_CHAR (escape_glyph);
+                  face_id = merge_faces (it->f, Qt, lface_id,
+                                         it->face_id);
                 }
               else
                 {
                   /* Merge the escape-glyph face into the current face.  */
                   face_id = merge_faces (it->f, Qescape_glyph, 0,
                                          it->face_id);
-                  escape_glyph = '\\';
                 }
 
               if (it->c == 0x8a0 || it->c == 0x8ad)
@@ -12284,7 +12284,11 @@ redisplay_window (window, just_this_one_p)
     {
       init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID);
       move_it_vertically_backward (&it, 0);
+#if 0
+      /* I think this assert is bogus if buffer contains
+         invisible text or images.  KFS.  */
       xassert (IT_CHARPOS (it) <= PT);
+#endif
       it.current_y = 0;
     }