merge from trunk

28 files changed, 125 insertions, 198 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index aea5701ec9c..6629a29ed9e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,26 +1,79 @@
+2010-04-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * bidi.c (bidi_resolve_explicit, bidi_level_of_next_char): Check
+        bidi_it->bytepos against ZV_BYTE instead of bidi_it->ch against
+        BIDI_EOB.  Fixes infloop with vertical cursor motion at ZV.
+
+        * w32fns.c (x_create_tip_frame): Copy `parms' before we modify it
+        in this function.  (Bug#5703)
+
+2010-04-03  Chong Yidong  <cyd@stupidchicken.com>
+
+        * nsterm.h: Fix last change.
+
+2010-04-03  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * m/intel386.h (NO_REMAP): Move definition ...
+        * s/msdos.h (NO_REMAP): ... here.
+
+        * m/vax.h (CRT0_DUMMIES): Remove, unused.
+
+        * ecrt0.c: Remove MSDOS, m68k and __sparc__ conditionals, file not
+        used on those platforms.
+
+2010-04-02  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Remove extern errno declarations.
+        * xterm.c:
+        * xrdb.c:
+        * w32term.c:
+        * unexec.c:
+        * unexaix.c:
+        * sysdep.c:
+        * process.c:
+        * lread.c:
+        * keyboard.c:
+        * floatfns.c:
+        * filelock.c:
+        * fileio.c:
+        * emacs.c (main):
+        * ecrt0.c:
+        * dispnew.c:
+        * callproc.c:
+        * buffer.c: Remove errno extern declarations.
+        * s/netbsd.h (NEED_ERRNO): Remove.
+
+2010-04-01  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Remove all uses of LIBX11_SYSTEM.
+        * Makefile.in (LIBX11_SYSTEM): Remove.
+        * s/msdos.h (LIBX11_SYSTEM): Do not define, define LIBS_SYSTEM
+        instead.
+
 2010-04-01  Eli Zaretskii  <eliz@gnu.org>
 
         Remove support for DJGPP v1.x (bug#5813).
 
         * w16select.c (__dpmi_int): Remove DJGPP v1.x compatibility.
-        * s/msdos.h: 
-        * unexec.c (make_hdr, copy_text_and_data): 
-        * sysdep.c (wait_for_termination, sys_subshell): 
+        * s/msdos.h:
+        * unexec.c (make_hdr, copy_text_and_data):
+        * sysdep.c (wait_for_termination, sys_subshell):
         * msdos.c (dos_set_window_size, msdos_set_cursor_shape)
-        (IT_set_terminal_modes): 
-        (__write, _rename, gethostname, gettimeofday, alarm, fork, kill)
-        (dos_ttraw, dos_ttcooked, run_msdos_command, abort): Remove DJGPP
-        v1.x code and tests of the value of __DJGPP__.
+        (IT_set_terminal_modes, __write, _rename, gethostname)
+        (gettimeofday, alarm, fork, kill, dos_ttraw, dos_ttcooked)
+        (run_msdos_command, abort): Remove DJGPP v1.x code and tests of
+        the value of __DJGPP__.
         (nice, pause, sigsetmask, sigblock): Remove DJGPP v1.x
         compatibility code.
-
-        * lread.c: 
-        * gmalloc.c (memalign): 
-        * fileio.c (Fcopy_file, check_executable, Ffile_modes): 
-        * emacs.c (main): 
-        * dosfns.c (init_dosfns): 
+        * lread.c:
+        * gmalloc.c (memalign):
+        * fileio.c (Fcopy_file, check_executable, Ffile_modes):
+        * emacs.c (main):
+        * dosfns.c (init_dosfns):
         * dired.c (file_name_completion_stat): Remove tests of __DJGPP__.
 
+2010-04-01  Eli Zaretskii  <eliz@gnu.org>
+
         * xdisp.c (set_cursor_from_row): Fix cursor positioning when the
         string with `cursor' property comes from an `after-string'
         overlay.  (Bug#5816)
@@ -88,7 +141,7 @@
 
         * xdisp.c (x_consider_frame_title, update_window_cursor):
         Remove HAVE_NS conditionals.
-        (prepare_menu_bars)[HAVE_NS]: Call ns_set_doc_edited.
+        (prepare_menu_bars) [HAVE_NS]: Call ns_set_doc_edited.
 
         * nsfns.m (x_implicitly_set_name): If frame-title-format is t, use
         filename for the title.
@@ -445,7 +498,7 @@
 2010-03-12  Eli Zaretskii  <eliz@gnu.org>
 
         These changes remove termcap.c from the build on Posix platforms.
-        * Makefilie.in (termcapobj): Move termcap.o from here...
+        * Makefile.in (termcapobj): Move termcap.o from here...
         (MSDOS_OBJ): ...to here.
         (termcapobj) [!LIBS_TERMCAP]: Remove specialized value, as it is
         now identical to when LIBS_TERMCAP is defined.
@@ -730,7 +783,7 @@
 2010-01-19  Alan Mackenzie  <acm@muc.de>
 
         Fix spurious before-change-functions invocation from (insert ?\n).
-        * textprop.c (set_text_properties): rename parameter
+        * textprop.c (set_text_properties): Rename parameter
         `signal_after_change_p' to `coherent_change_p', and make the
         invocation of `modify_region' conditional on it.
 
@@ -10752,7 +10805,7 @@
 
         * font.c (Vfont_encoding_alist, find_font_encoding): Move from
         fontset.c.
-        (font_pixel_size)[! HAVE_WINDOW_SYSTEM]: Return 1.
+        (font_pixel_size) [! HAVE_WINDOW_SYSTEM]: Return 1.
         (font_open_entity): Update FRAME_X_DISPLAY_INFO (f)->n_fonts,
         FRAME_SMALLEST_CHAR_WIDTH (f), and FRAME_SMALLEST_FONT_HEIGHT (f)
         only when HAVE_WINDOW_SYSTEM is defined.
@@ -20586,7 +20639,7 @@
 
 2007-08-29  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>  (tiny change)
 
-        * term.c (dissociate_if_controlling_tty)[USG]: Fix parse error.
+        * term.c (dissociate_if_controlling_tty) [USG]: Fix parse error.
 
 2007-08-29  Yoshiaki Kasahara  <kasahara@nc.kyushu-u.ac.jp>  (tiny change)
 
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index d4d99a80a18..39b70d9b199 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -2137,7 +2137,7 @@
 
         * Makefile.in (keymap.o): Add "keymap.h" and "window.h" dependencies.
 
-        * keymap.c: include "window.h".
+        * keymap.c: Include "window.h".
         (Fcommand_remapping): New optional POSITION argument.
         (Fkey_binding): New optional POSITION argument.  Completely rework
         handling of mouse clicks to get the same order of keymaps as
@@ -5867,9 +5867,9 @@
 
 2005-12-26  Luc Teirlinck  <teirllm@auburn.edu>
 
-        * keyboard.h: extern last_point_position_window.
+        * keyboard.h: Extern last_point_position_window.
 
-        * undo.c: include keyboard.h.
+        * undo.c: Include keyboard.h.
 
         * Makefile.in (undo.o): Depend on keyboard.h.
 
@@ -8276,7 +8276,7 @@
         * xdisp.c (syms_of_xdisp) <nobreak-char-display>: Doc fix.
         (syms_of_xdisp) <void-text-area-pointer>: Doc fix.
 
-        * fileio.c (Frename_file)[!DOS_NT]: Don't call chown on MSDOS/Windows.
+        * fileio.c (Frename_file) [!DOS_NT]: Don't call chown on MSDOS/Windows.
 
 2005-06-23  Richard M. Stallman  <rms@gnu.org>
 
@@ -12611,7 +12611,7 @@
         * macterm.c (mac_check_for_quit_char): Remove warning for using
         NULL where 0 should be used.
         * unexmacosx.c: Use malloc/malloc.h on Tiger instead of
-        objc/malloc.h
+        objc/malloc.h.
         * mac.c: Include time.h for Tiger compatibility.
 
 2004-10-07  Kim F. Storm  <storm@cua.dk>
@@ -12843,7 +12843,7 @@
         * Makefile.in (msdos.o): Depend on buffer.h, commands.h, and
         blockinput.h.
         (dosfns.o): Depend on blockinput.h, window.h, dispextern.h,
-        charset.h, and coding.h
+        charset.h, and coding.h.
         (w16select.o): Depend on buffer.h, charset.h, coding.h, and composite.h.
         (term.o): Depend on window.h and keymap.h.
         (abbrev.o): Depend on syntax.h.
@@ -17222,7 +17222,7 @@
 2003-09-01  Jason Rumney  <jasonr@gnu.org>
 
         * makefile.w32-in (alloca.o): Remove.
-        (coding.o): Depend on intervals.h
+        (coding.o): Depend on intervals.h.
         (emacs.o, bytecode.o): Depend on window.h.
 
 2003-09-01  Dave Love  <fx@gnu.org>
@@ -22643,7 +22643,7 @@
         (Fx_popup_menu): Don't show pop up menu until preceding one is
         actually cleaned up.  Moved UNGCPRO outside #ifdef HAVE_MENUS block.
 
-        * w32menu.c: Changes adapted from xmenu.c
+        * w32menu.c: Changes adapted from xmenu.c.
         (set_frame_menubar): First parse all submenus,
         then make widget_value trees from them.
         Don't allocate any widget_value objects
@@ -24232,7 +24232,7 @@
         m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h,
         m/ibms390.h, m/intel386.h, m/iris4d.h, m/irist.h, m/isi-ov.h,
         m/m68k.h, m/macppc.h, m/masscomp.h, m/mg1.h, m/mips-siemens.h,
-        m/mips.h, m/news-r6.h, m/news.h, m/next.h, m/nh3000.h, m/nh4000.h
+        m/mips.h, m/news-r6.h, m/news.h, m/next.h, m/nh3000.h, m/nh4000.h,
         m/ns32000.h, m/orion.h, m/pfa50.h, m/plexus.h, m/pmax.h,
         m/powerpcle.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h,
         m/sparc.h, m/sr2k.h, m/symmetry.h, m/tad68k.h, m/tahoe.h,
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index de162cb39bc..6da7b6862a5 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -2886,10 +2886,10 @@
 
         * sysdep.c: Define numerous routines to emulate Unix system calls.
 
-        * xfaces.c: on MacOS, define the set of colors listed in rgb.txt
+        * xfaces.c: On MacOS, define the set of colors listed in rgb.txt
         file of an X Window environment.
 
-        * xfaces.c: on MacOS, define the Lisp functions x-display-color-p,
+        * xfaces.c: On MacOS, define the Lisp functions x-display-color-p,
         x-display-grayscale, x-color-defined-p, and x-color-values.
 
         * sysdep.c [macintosh] (stat, fstat, mkdir, rmdir, utime, access)
@@ -3160,7 +3160,7 @@
 
 1999-08-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
-        * unexelf.c: Merge IRIX debugging info patch from unexsgi.c
+        * unexelf.c: Merge IRIX debugging info patch from unexsgi.c.
         * m/iris4d.h: Use unexelf for IRIX 5.*.
         * m/iris5d.h: Use unexelf for IRIX 6.*.
         * unexsgi.c: Deleted.
@@ -3767,8 +3767,8 @@
 1999-08-06  Gerd Moellmann  <gerd@gnu.org>
 
         * xdisp.c (compute_line_metrics): If first line's physical ascent
-         is larger than its logical ascent, use the physical ascent, and
-         make the row taller.  Set row's overlapping_p flag.
+        is larger than its logical ascent, use the physical ascent, and
+        make the row taller.  Set row's overlapping_p flag.
 
         * dispnew.c (redraw_overlapping_rows): Use flag overlapping_p.
         (direct_output_for_insert): Ditto.
@@ -4675,7 +4675,7 @@
 
 1999-06-04  Gerd Moellmann  <gerd@gnu.org>
 
-        * xfaces.c (recompute_basic_faces)[GLYPH_DEBUG]: Check return
+        * xfaces.c (recompute_basic_faces) [GLYPH_DEBUG]: Check return
         value of realize_basic_faces.
         (load_face_font_or_fontset): Store full font name in face.
         (realize_default_face): Use full font name.
@@ -5601,9 +5601,9 @@
         * window.c (coordinates_in_window): Use CURRENT_MODE_LINE_HEIGHT.
 
         * xdisp.c (redisplay_window): If mode line height has changed,
-         arrange for a thorough immediate redisplay using the correct mode
-         line height.
-         (window_box_height): Use CURRENT_MODE_LINE_HEIGHT.
+        arrange for a thorough immediate redisplay using the correct mode
+        line height.
+        (window_box_height): Use CURRENT_MODE_LINE_HEIGHT.
 
         * dispextern.h (MATRIX_MODE_LINE_HEIGHT): New.
         (CURRENT_MODE_LINE_HEIGHT): New.
@@ -7062,7 +7062,7 @@
 1998-05-04  Gerd Moellmann  <gerd@gnu.org>
 
         * Makefile.in (LIBXPM): If not already defined, define to -lXpm.
-        (LIBX)[HAVE_X11]: Add LIBXPM.
+        (LIBX) [HAVE_X11]: Add LIBXPM.
 
         * xfns.c (xpm_image_p): Implementation of image type functions
         for XPM.
@@ -10052,7 +10052,7 @@
 
         * xterm.h (WINDOW_COL_PIXEL_X etc.) Removed.
 
-        * dispextern.h (WINDOW_TO_FRAME_HPOS/VPOS): Moved to dispnew.c
+        * dispextern.h (WINDOW_TO_FRAME_HPOS/VPOS): Moved to dispnew.c.
 
         * xfns.c (x_contour_region): Use pixel coordinates from window
         cursor instead of WINDOW_TO_FRAME_H/VPOS.
@@ -10897,7 +10897,7 @@
         (MATRIX_ROW_INVERSE_P): Former MATRIX_ROW_HIGHLIGHT_P.
         (struct glyph_row): HIGHLIGHT_P -> INVERSE_P
 
-        * all files: use above new names.
+        * all files: Use above new names.
 
         * dispnew.c (scroll_frame_lines): Simplified.  Use
         SCROLL_GLYPH_MATRIX.
@@ -10961,7 +10961,7 @@
         (init_display): Ditto.
         (syms_of_display): Ditto.
 
-        * dispextern.h: add prototypes for REDRAW_FRAME,
+        * dispextern.h: Add prototypes for REDRAW_FRAME,
         REDRAW_GARBAGED_FRAMES, CANCEL_LINE, CLEAR_FRAME_RECORDS,
         INIT_DESIRED_GLYPHS, SCROLL_FRAME_LINES, PRESERVE_OTHER_COLUMNS,
         ADJUST_WINDOW_CHARSTARTS, CANCEL_MY_COLUMNS,
@@ -11108,9 +11108,9 @@
         (make_window): Initialize DESIRED_MATRIX and CURRENT_MATRIX.
         (replace_window): Reset DESIRED_MATRIX and CURRENT_MATRIX
 
-        * Makefile.in (window.o): Add dependency window.c -> dispextern.h
+        * Makefile.in (window.o): Add dependency window.c -> dispextern.h.
 
-        * window.c: Include dispextern.h
+        * window.c: Include dispextern.h.
 
         * scroll.c (do_scrolling): Use new glyphs.
         (do_direct_scrolling): Ditto.
@@ -11141,9 +11141,9 @@
         (write_glyphs): Ditto.
         (insert_glyphs): Ditto.
 
-        * Makefile.in (term.o): term.c depends on dispextern.h
+        * Makefile.in (term.o): term.c depends on dispextern.h.
 
-        * term.c: Include dispextern.h
+        * term.c: Include dispextern.h.
 
         * dispnew.c (direct_output_forward_char): Old glyph functions
         removed, new inserted.
@@ -11560,8 +11560,8 @@
 1999-05-02  Andrew Innes  <andrewi@gnu.org>
 
         * s/ms-w32.h (HAVE_FSYNC): New macro.
-         (fsync): Map to _commit.
-         (ftruncate): Map to _chsize.
+        (fsync): Map to _commit.
+        (ftruncate): Map to _chsize.
 
         * w32term.c (dumpglyphs): On Windows NT, do output in Unicode even
         for ASCII, if enabled, to avoid memory allocation overhead for
@@ -11666,7 +11666,7 @@
 
         * fontset.c (Fquery_fontset): Don't check for fontset aliases here.
         (Fnew_fontset, Fset_fontset_font): Check for them here.
-         (Ffontset_info, Fnew_fontset, Fset_fontset_font):
+        (Ffontset_info, Fnew_fontset, Fset_fontset_font):
         Fix error message syntax.
 
         * buffer.c (Fmake_indirect_buffer): Copy multibyte status
@@ -12775,7 +12775,7 @@
 1998-12-06  Eli Zaretskii  <eliz@mescaline.gnu.org>
 
         * Makefile.in (msdos.o): Depend on termchar.h, charset.h,
-        coding.h, and disptab.h
+        coding.h, and disptab.h.
 
         * msdos.c (Vdos_unsupported_char_glyph): New variable.
         (syms_of_msdos): DEFVAR_LISP it.
diff --git a/src/Makefile.in b/src/Makefile.in
index a71292e14f7..2d68910667f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -287,10 +287,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
 #endif
         $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
-#ifndef LIBX11_SYSTEM
-#define LIBX11_SYSTEM
-#endif
-
 #ifndef LIB_X11_LIB
 #define LIB_X11_LIB -lX11
 #endif
@@ -379,7 +375,7 @@ LIBXT=$(LIBW)
 /* LD_SWITCH_X_DEFAULT comes after everything else that specifies
    options for where to find X libraries, but before those libraries.  */
 X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT
-LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) $(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) LIB_X11_LIB LIBX11_SYSTEM $(XFT_LIBS)
+LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) $(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) LIB_X11_LIB $(XFT_LIBS)
 #else /* not HAVE_X11 */
 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE
 #endif /* not HAVE_X11 */
diff --git a/src/bidi.c b/src/bidi.c
index ea47cd33fec..7da8cd4a88c 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1242,7 +1242,7 @@ bidi_resolve_explicit (struct bidi_it *bidi_it)
   if (prev_level < new_level
       && bidi_it->type == WEAK_BN
       && bidi_it->ignore_bn_limit == 0 /* only if not already known */
-      && bidi_it->ch != BIDI_EOB       /* not already at EOB */
+      && bidi_it->bytepos < ZV_BYTE    /* not already at EOB */
       && bidi_explicit_dir_char (FETCH_CHAR (bidi_it->bytepos
                                              + bidi_it->ch_len)))
     {
@@ -1648,7 +1648,7 @@ bidi_level_of_next_char (struct bidi_it *bidi_it)
   if (bidi_it->scan_dir == 1)
     {
       /* There's no sense in trying to advance if we hit end of text.  */
-      if (bidi_it->ch == BIDI_EOB)
+      if (bidi_it->bytepos >= ZV_BYTE)
         return bidi_it->resolved_level;
 
       /* Record the info about the previous character.  */
diff --git a/src/buffer.c b/src/buffer.c
index 0c6e57d45be..9035a986b4c 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -28,11 +28,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 #include <setjmp.h>
 
-#ifndef USE_CRT_DLL
-extern int errno;
-#endif
-
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -4627,7 +4622,6 @@ buffer_slot_type_mismatch (newval, type)
 #endif
 
 #include <stdio.h>
-#include <errno.h>
 
 #if MAP_ANON == 0
 #include <fcntl.h>
diff --git a/src/callproc.c b/src/callproc.c
index bed3302e508..378c647f385 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -25,10 +25,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 #include <setjmp.h>
 
-#ifndef USE_CRT_DLL
-extern int errno;
-#endif
-
 /* Define SIGCHLD as an alias for SIGCLD.  */
 
 #if !defined (SIGCHLD) && defined (SIGCLD)
@@ -61,7 +57,6 @@ extern int errno;
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/param.h>
-#include <errno.h>
 #endif /* MSDOS */
 
 #ifndef O_RDONLY
diff --git a/src/dispnew.c b/src/dispnew.c
index 52d7f38728f..2be00c9c3b0 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -5809,9 +5809,6 @@ window_change_signal (signalnum) /* If we don't have an argument, */
      int signalnum;             /* some compilers complain in signal calls.  */
 {
   int width, height;
-#ifndef USE_CRT_DLL
-  extern int errno;
-#endif
   int old_errno = errno;
 
   struct tty_display_info *tty;
diff --git a/src/ecrt0.c b/src/ecrt0.c
index 7dbbd6c5ef1..0d7d26d3685 100644
--- a/src/ecrt0.c
+++ b/src/ecrt0.c
@@ -59,13 +59,7 @@ And always:
 
 int data_start = 0;
 
-#ifdef NEED_ERRNO
-int errno;
-#endif
-
-#ifndef MSDOS
 char **environ;
-#endif
 
 #ifndef static
 /* On systems where the static storage class is usable, this function
@@ -104,70 +98,7 @@ start1 (CRT0_DUMMIES argc, xargv)
      and optimize it out.  */
   (void) &start1;
 }
-#else /* not CRT0_DUMMIES */
-
-/* This is a kludge.  Now that the CRT0_DUMMIES mechanism above exists,
-   most of these machines could use the vax code above
-   with some suitable definition of CRT0_DUMMIES.
-   Then the symbol m68k could be flushed.
-   But I don't want to risk breaking these machines
-   in a version 17 patch release, so that change is being put off.  */
-
-#ifdef m68k                     /* Can't do it all from C */
-        asm ("  global  _start");
-        asm ("  text");
-        asm ("_start:");
-        asm ("  comm    splimit%,4");
-        asm ("  global  exit");
-        asm ("  text");
-        asm ("  mov.l   %d0,splimit%");
-        asm ("  jsr     start1");
-        asm ("  mov.l   %d0,(%sp)");
-        asm ("  jsr     exit");
-        asm ("  mov.l   &1,%d0");       /* d0 = 1 => exit */
-        asm ("  trap    &0");
-
-/* ignore takes care of skipping the a6 value pushed in start.  */
-static
-start1 (argc, xargv)
-     int argc;
-     char *xargv;
-{
-  register char **argv = &xargv;
-  environ = argv + argc + 1;
-
-  if ((char *)environ == xargv)
-    environ--;
-  exit (main (argc, argv, environ));
-}
-
-#endif /* m68k */
-
-#endif /* not CRT0_DUMMIES */
-
-#ifdef __sparc__
-asm (".global __start");
-asm (".text");
-asm ("__start:");
-asm ("  mov     0, %fp");
-asm ("  ld      [%sp + 64], %o0");
-asm ("  add     %sp, 68, %o1");
-asm ("  sll     %o0, 2, %o2");
-asm ("  add     %o2, 4, %o2");
-asm ("  add     %o1, %o2, %o2");
-asm ("  sethi   %hi(_environ), %o3");
-asm ("  st      %o2, [%o3+%lo(_environ)]");
-asm ("  andn    %sp, 7, %sp");
-asm ("  call    _main");
-asm ("  sub     %sp, 24, %sp");
-asm ("  call    __exit");
-asm ("  nop");
-
-#endif /* __sparc__ */
-
-#if __FreeBSD__ == 2
-char *__progname;
-#endif
+#endif /* CRT0_DUMMIES */
 
 /* arch-tag: 4025c2fb-d6b1-4d29-b1b6-8100b6bd1e74
    (do not change this comment) */
diff --git a/src/emacs.c b/src/emacs.c
index 0d90776df83..400a6b0e594 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -756,9 +756,6 @@ main (int argc, char **argv)
   char stack_bottom_variable;
   int do_initial_setlocale;
   int skip_args = 0;
-#ifndef USE_CRT_DLL
-  extern int errno;
-#endif
 #ifdef HAVE_SETRLIMIT
   struct rlimit rlim;
 #endif
diff --git a/src/fileio.c b/src/fileio.c
index 4ae74de5c67..c62d5724eff 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -53,12 +53,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <ctype.h>
 #include <errno.h>
 
-#ifndef vax11c
-#ifndef USE_CRT_DLL
-extern int errno;
-#endif
-#endif
-
 #include "lisp.h"
 #include "intervals.h"
 #include "buffer.h"
diff --git a/src/filelock.c b/src/filelock.c
index 7c69ea954fc..b11338c58b6 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -47,9 +47,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif /* __FreeBSD__ */
 
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
 
 #include "lisp.h"
 #include "buffer.h"
diff --git a/src/floatfns.c b/src/floatfns.c
index 97d9ec00aae..3f7030b7605 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -99,10 +99,6 @@ extern double logb ();
 
 #ifdef FLOAT_CHECK_ERRNO
 # include <errno.h>
-
-#ifndef USE_CRT_DLL
-extern int errno;
-#endif
 #endif
 
 #ifdef FLOAT_CATCH_SIGILL
diff --git a/src/keyboard.c b/src/keyboard.c
index 3cd042fb21e..f2aeff89542 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -79,10 +79,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "nsterm.h"
 #endif
 
-#ifndef USE_CRT_DLL
-extern int errno;
-#endif
-
 /* Variables for blockinput.h: */
 
 /* Non-zero if interrupt input is blocked right now.  */
diff --git a/src/lread.c b/src/lread.c
index 90edca90a16..83ebc8b3b10 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -73,10 +73,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define file_tell ftell
 #endif
 
-#ifndef USE_CRT_DLL
-extern int errno;
-#endif
-
 /* hash table read constants */
 Lisp_Object Qhash_table, Qdata;
 Lisp_Object Qtest, Qsize;
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 8b3c5fff064..dc50d5ea6a2 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -85,10 +85,6 @@ NOTE-END */
 #define TEXT_START 0
 #endif /* USG */
 
-#ifdef MSDOS
-#define NO_REMAP
-#endif
-
 #ifdef WINDOWSNT
 #define VIRT_ADDR_VARIES
 #define DATA_START      get_data_start ()
diff --git a/src/m/vax.h b/src/m/vax.h
index 62c78e68ab0..f33c2d5227a 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -34,10 +34,6 @@ NOTE-END  */
 
 /* #define vax    -- appears to be done automatically  */
 
-/* crt0.c should use the vax-bsd style of entry, with no dummy args.  */
-
-#define CRT0_DUMMIES
-
 /* USG systems I know of running on Vaxes do not actually
    support the load average, so disable it for them.  */
 
diff --git a/src/process.c b/src/process.c
index 43fa78c7bd4..3c539024b0a 100644
--- a/src/process.c
+++ b/src/process.c
@@ -195,10 +195,6 @@ extern int serial_open (char *port);
 extern void serial_configure (struct Lisp_Process *p, Lisp_Object contact);
 #endif
 
-#ifndef USE_CRT_DLL
-extern int errno;
-#endif
-
 #ifndef HAVE_H_ERRNO
 extern int h_errno;
 #endif
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 29fbdab8369..15c3c5b1452 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -149,7 +149,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
    commentary below, in the non-X branch.  The 140KB number was
    measured on GNU/Linux and on MS-WIndows.  */
 #define SYSTEM_PURESIZE_EXTRA (-170000+140000)
-#define LIBX11_SYSTEM -lxext -lsys
+#define LIBS_SYSTEM -lxext -lsys
 #else
 /* We need a little extra space, see ../../lisp/loadup.el.
    As of 20091024, DOS-specific files use up 62KB of pure space.  But
@@ -170,5 +170,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
 
+#define NO_REMAP
+
 /* arch-tag: d184f860-815d-4ff4-8187-d05c0f3c37d0
    (do not change this comment) */
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 5552aece50a..682b9482352 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -28,8 +28,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define LIBS_TERMCAP -ltermcap
 
-#define NEED_ERRNO
-
 #define START_FILES pre-crt0.o /usr/lib/crt0.o START_FILES_1 /usr/lib/crtbegin.o
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o END_FILES_1
 #undef LIB_GCC
diff --git a/src/sysdep.c b/src/sysdep.c
index 71b2a0f461b..37e7dfbaf9c 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -94,12 +94,6 @@ extern int etext;
 extern unsigned start __asm__ ("start");
 #endif
 
-#ifndef USE_CRT_DLL
-#ifndef errno
-extern int errno;
-#endif
-#endif
-
 #include <sys/file.h>
 
 #ifdef HAVE_FCNTL_H
diff --git a/src/unexaix.c b/src/unexaix.c
index 97b69d7e5c7..2657d144296 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -435,7 +435,6 @@ write_segment (int new, char *ptr, char *end)
 {
   int i, nwrite, ret;
   char buf[80];
-  extern int errno;
   char zeros[UnexBlockSz];
 
   for (i = 0; ptr < end;)
diff --git a/src/unexec.c b/src/unexec.c
index 6cb27b35c36..1a27db1232d 100644
--- a/src/unexec.c
+++ b/src/unexec.c
@@ -466,9 +466,6 @@ write_segment (new, ptr, end)
 {
   register int i, nwrite, ret;
   char buf[80];
-#ifndef USE_CRT_DLL
-  extern int errno;
-#endif
   /* This is the normal amount to write at once.
      It is the size of block that NFS uses.  */
   int writesize = 1 << 13;
diff --git a/src/w32fns.c b/src/w32fns.c
index 938bd463b25..795e7208569 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5427,6 +5427,10 @@ x_create_tip_frame (dpyinfo, parms, text)
 
   kb = dpyinfo->terminal->kboard;
 
+  /* The calls to x_get_arg remove elements from PARMS, so copy it to
+     avoid destructive changes behind our caller's back.  */
+  parms = Fcopy_alist (parms);
+
   /* Get the name of the frame to use for resource lookup.  */
   name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING);
   if (!STRINGP (name)
diff --git a/src/w32term.c b/src/w32term.c
index 4ed7beda233..7222e26efd2 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -228,10 +228,6 @@ static int input_signal_count;
 
 extern Lisp_Object Vcommand_line_args, Vsystem_name;
 
-#ifndef USE_CRT_DLL
-extern int errno;
-#endif
-
 /* A mask of extra modifier bits to put into every keyboard char.  */
 extern EMACS_INT extra_keyboard_modifiers;
 
diff --git a/src/xdisp.c b/src/xdisp.c
index c6ae6ad4c14..997c76934d4 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12606,7 +12606,8 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
             }
           if (INTEGERP (glyph->object) && glyph->charpos < 0)
             --glyph;
-          /* By default, put the cursor on the rightmost glyph.  */
+          /* By default, in reversed rows we put the cursor on the
+             rightmost (first in the reading order) glyph.  */
           for (g = end + 1; g < glyph; g++)
             x += g->pixel_width;
           cursor_x = x;
@@ -12683,7 +12684,16 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
                 bpos_covered = bpos_max + XINT (chprop);
                 /* If the `cursor' property covers buffer positions up
                    to and including point, we should display cursor on
-                   this glyph.  */
+                   this glyph.  Note that overlays and text properties
+                   with string values stop bidi reordering, so every
+                   buffer position to the left of the string is always
+                   smaller than any position to the right of the
+                   string.  Therefore, if a `cursor' property on one
+                   of the string's characters has an integer value, we
+                   will break out of the loop below _before_ we get to
+                   the position match above.  IOW, integer values of
+                   the `cursor' property override the "exact match for
+                   point" strategy of positioning the cursor.  */
                 /* Implementation note: bpos_max == pt_old when, e.g.,
                    we are in an empty line, where bpos_max is set to
                    MATRIX_ROW_START_CHARPOS, see above.  */
diff --git a/src/xrdb.c b/src/xrdb.c
index c8cb55cb7b8..7808bacc59f 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -28,6 +28,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <unistd.h>
 #endif
 
+#include <errno.h>
 #include <epaths.h>
 
 #include <stdio.h>
@@ -734,8 +735,6 @@ fatal (msg, prog, x1, x2, x3, x4, x5)
     char *msg, *prog;
     int x1, x2, x3, x4, x5;
 {
-    extern int errno;
-
     if (errno)
       perror (prog);
 
diff --git a/src/xterm.c b/src/xterm.c
index 1114fcccc53..90db15d9ed4 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -309,8 +309,6 @@ extern Lisp_Object Vx_no_window_manager;
 
 extern Lisp_Object Qeql;
 
-extern int errno;
-
 /* A mask of extra modifier bits to put into every keyboard char.  */
 
 extern EMACS_INT extra_keyboard_modifiers;