merge trunk

17 files changed, 462 insertions, 212 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5d47f437d4a..b0965f8e514 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,125 @@
+2010-05-18  Juanma Barranquero  <lekktu@gmail.com>
+
+        * charset.c (load_charset_map_from_file): Don't call close after fclose.
+
+2010-05-18  Glenn Morris  <rgm@gnu.org>
+
+        * s/gnu-linux.h: Combine two conditionals.
+
+        * Makefile.in (otherobj): Include $(VMLIMIT_OBJ) separately from
+        $(POST_ALLOC_OBJ).
+
+        * Makefile.in (RALLOC_OBJ): New, set by configure.
+        (rallocobj): Replace with the previous variable.
+        (otherobj): Use $RALLOC_OBJ.
+
+        * s/gnu.h (REL_ALLOC) [DOUG_LEA_MALLOC]:
+        * s/gnu-linux.h (REL_ALLOC) [DOUG_LEA_MALLOC]: Move undef to configure.
+
+        * Makefile.in (GMALLOC_OBJ, VMLIMIT_OBJ): New, set by configure.
+        (gmallocobj, vmlimitobj): Replace with previous two variables.
+        (otherobj): Use $GMALLOC_OBJ, $VMLIMIT_OBJ.
+
+2010-05-17  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (OLDXMENU_DEPS): New, set by configure.
+        (stamp-oldxmenu): Use $OLDXMENU_DEPS.
+
+2010-05-16  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (${ns_appbindir}Emacs, ns-app): Always define these rules.
+
+        * Makefile.in (clean): Get rid of HAVE_NS conditional.
+
+        * Makefile.in (ns_appdir, ns_appbindir): Now configure adds the
+        trailing "/".
+
+        * Makefile.in (TEMACS_LDFLAGS2): New, set by configure.
+        (temacs${EXEEXT}): Combine the NS_IMPL_GNUSTEP case with the default.
+
+        * Makefile.in (GNUSTEP_SYSTEM_LIBRARIES): Remove, unused.
+        (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New, set by configure.
+        (LD) [NS_IMPL_GNUSTEP]: Set to $(CC) -rdynamic.
+        (temacs${EXEEXT}): Remove $LOCALCPP, never defined or referenced.
+        Make most of the NS_IMPL_GNUSTEP case the same as the default case.
+
+        * Makefile.in (temacs${EXEEXT}) [!NS_IMPL_GNUSTEP]:
+        Remove ${STARTFLAGS}, nothing ever sets it.
+
+2010-05-16  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * m/ia64.h (UNEXEC): Remove, set in s/*.h.
+
+2010-05-16  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (LIBX_BASE): Always define.
+
+        * Makefile.in (LIBX_OTHER): Move out of cpp section.
+
+        * Makefile.in (LIBXT): Always define.
+
+2010-05-15  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (OLDXMENU, LIBXMENU, LIBX_OTHER): Always define.
+
+        * Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ.
+        (obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ.
+
+2010-05-15  Ken Raeburn  <raeburn@raeburn.org>
+
+        * lisp.h (XFLOAT_DATA): Use "0?x:x" to generate an rvalue.  (Bug#5916)
+        (LISP_MAKE_RVALUE) [!USE_LISP_UNION_TYPE && !__GNUC__]: Likewise.
+
+        * emacs.c (main): Initialize initial-environment and
+        process-environment before generating from env, not after.
+
+        Handle --version reasonably in CANNOT_DUMP configuration.
+        * emacs.c (emacs_version, emacs_copyright): New string variables.
+        (Vemacs_version, Vemacs_copyright): New Lisp_Object variables.
+        (syms_of_emacs): Defvar them, and initialize them from the C
+        string variables.
+        (main): If initialization hasn't been done, print initial version
+        info from the C strings, instead of starting an interactive session.
+
+2010-05-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * bidi.c (bidi_paragraph_init): Don't leave alone garbage values
+        of bidi_it->paragraph_dir.  Call bidi_initialize if needed.
+        (bidi_paragraph_init): Remove redundant assertion that we are at
+        the beginning of a line after call to bidi_find_paragraph_start.
+
+        * xdisp.c (Fcurrent_bidi_paragraph_direction): New function.
+        (syms_of_xdisp): Defsubr it.
+
+        * Makefile.in: Fix MSDOS-related comments.
+
+2010-05-15  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (OLDXMENU_TARGET): New, set by configure.
+        (really-lwlib, really-oldXMenu): Always define.
+        ($OLDXMENU): Depend on $OLDXMENU_TARGET.
+
+        * Makefile.in: Simplify cpp conditional.
+
+        * Makefile.in (${ns_appdir}): Simplify using umask.
+
+        * Makefile.in (${ns_appdir}): Remove references to CVS-related files.
+
+2010-05-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * eval.c (specbind): Remove left-over duplicate test.
+        Disallow let-binding frame-local vars.  Add comment.
+
+2010-05-14  Eli Zaretskii  <eliz@gnu.org>
+
+        Make the cache of bidi iterator states dynamically allocated.
+        * bidi.c (bidi_cache_shrink): New function.
+        (bidi_init_it): Call it.
+        (bidi_cache_iterator_state): Enlarge the cache if needed.
+
+        * bidi.c (bidi_move_to_visually_next): Rename from
+        bidi_get_next_char_visually.  All callers changed.
+
 2010-05-14  Kenichi Handa  <handa@m17n.org>
 
         * dispextern.h (struct composition_it): New member reversed_p.
@@ -6,10 +128,10 @@
         ENDPOS < CHARPOS.
         (composition_reseat_it): Handle the case that ENDPOS < CHARPOS.
         Set CMP_IT->reversed_p.
-        (composition_update_it): Pay attention ot CMP_IT->reversed_p.
+        (composition_update_it): Pay attention to CMP_IT->reversed_p.
 
-        * xdisp.c (set_iterator_to_next): Call
-        composition_compute_stop_pos with negative ENDPOS if we are
+        * xdisp.c (set_iterator_to_next):
+        Call composition_compute_stop_pos with negative ENDPOS if we are
         scanning backward.  Call composition_compute_stop_pos if scan
         direction is changed.
         (next_element_from_buffer): Call composition_compute_stop_pos with
@@ -19,8 +141,7 @@
 
 2010-05-14  Kenichi Handa  <handa@m17n.org>
 
-        * font.c (font_range): Return the range for the font found at
-        first.
+        * font.c (font_range): Return the range for the font found at first.
 
 2010-05-14  Glenn Morris  <rgm@gnu.org>
 
@@ -102,7 +223,6 @@
         * xdisp.c (init_iterator): Don't turn on bidi reordering in
         unibyte buffers.  See
         http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html.
->>>>>>> MERGE-SOURCE
 
 2010-05-10  Glenn Morris  <rgm@gnu.org>
 
@@ -11480,7 +11600,7 @@
         definitions from xmenu.c.  Suggested by Adrian Robert.
 
         * xmenu.c: Remove platform-independent menu definitions.
-        (menu_items menu_items_inuse, menu_items_allocated)
+        (menu_items, menu_items_inuse, menu_items_allocated)
         (menu_items_used, menu_items_n_panes)
         (menu_items_submenu_depth): Move to keyboard.h.
         (init_menu_items, finish_menu_items, unuse_menu_items)
diff --git a/src/Makefile.in b/src/Makefile.in
index 8c723d1c886..676d2a0834e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -65,6 +65,7 @@ config_h = config.h $(M_FILE) $(S_FILE)
 
 bootstrap_exe = ${abs_builddir}/bootstrap-emacs${EXEEXT}
 
+## ns-app if HAVE_NS, else empty.
 OTHER_FILES = @OTHER_FILES@
 
 CRT_DIR=@CRT_DIR@
@@ -114,6 +115,9 @@ LD_SWITCH_SYSTEM_EXTRA=@LD_SWITCH_SYSTEM_EXTRA@
 ## Flags to pass to ld only for temacs.
 TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_EXTRA) $(LD_SWITCH_SYSTEM_TEMACS)
 
+## $LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason).
+TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@
+
 ## Some systems define this to request special libraries.
 LIBS_SYSTEM=@LIBS_SYSTEM@
 
@@ -167,11 +171,43 @@ LIBXTR6=@LIBXTR6@
 ## Only used if HAVE_X_WINDOWS.
 LIBXT_OTHER=@LIBXT_OTHER@
 
+## Only used if HAVE_X11 && !USE_GTK.
+## really-lwlib if USE_X_TOOLKIT, else really-oldxmenu.
+OLDXMENU_TARGET=@OLDXMENU_TARGET@
+
+## If !HAVE_X11 || USE_GTK, empty.
+## Else if USE_X_TOOLKIT, ${lwlibdir}liblw.a.
+## Else ${oldXMenudir}libXMenu11.a.
+OLDXMENU=@OLDXMENU@
+
+## If HAVE_X11 && !USE_GTK, ${OLDXMENU} ../src/${OLDXMENU}; else empty.
+## We use stamp-xmenu with these two deps to both ensure that lwlib
+## gets remade based on its dependencies in its own makefile,
+## and remake temacs if lwlib gets changed by this. 
+OLDXMENU_DEPS=@OLDXMENU_DEPS@
+
+## If !HAVE_X11 && HAVE_X_WINDOWS, -lXMenu (this case no longer possible).
+## Else if !HAVE_X11 || USE_GTK, empty.
+## Else $(OLDXMENU).
+LIBXMENU=@LIBXMENU@
+
 XMENU_OBJ=@XMENU_OBJ@
 XOBJ=@XOBJ@
 
 TOOLKIT_LIBW=@TOOLKIT_LIBW@
 
+## Only used if HAVE_X11, in LIBX_OTHER.
+LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
+
+## If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty.
+LIBX_OTHER=@LIBX_OTHER@
+
+## LIBXMENU is nil if !HAVE_X_WINDOWS.
+## LD_SWITCH_X_SITE should not be used if not using X, but nothing
+## sets it at present, and if something ever does, it should be
+## configure, which should set it to nil in non-X builds.
+LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
+
 LIBSOUND= @LIBSOUND@
 CFLAGS_SOUND= @CFLAGS_SOUND@
 
@@ -184,7 +220,7 @@ WIDGET_OBJ=@WIDGET_OBJ@
 ## sheap.o if CYGWIN, otherwise empty.
 CYGWIN_OBJ=@CYGWIN_OBJ@
 
-## dosfns.o msdos.o if MSDOS.
+## dosfns.o msdos.o w16select.o if MSDOS.
 MSDOS_OBJ =
 ## w16select.o termcap.o if MSDOS && HAVE_X_WINDOWS.
 MSDOS_X_OBJ =
@@ -194,16 +230,18 @@ MSDOS_SUPPORT_REAL = ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \
 ## $MSDOS_SUPPORT_REAL if MSDOS.
 MSDOS_SUPPORT = 
 
-ns_appdir=@ns_appdir@/
-ns_appbindir=@ns_appbindir@/
+ns_appdir=@ns_appdir@
+ns_appbindir=@ns_appbindir@
 ns_appsrc=@ns_appsrc@
 NS_OBJ=@NS_OBJ@
 NS_SUPPORT=@NS_SUPPORT@
-## Next two only set if NS_IMPL_GNUSTEP.
+## Only set if NS_IMPL_GNUSTEP.
 GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@
-GNUSTEP_SYSTEM_LIBRARIES=@GNUSTEP_SYSTEM_LIBRARIES@
 
-## Only used if HAVE_X_WINDOWS.
+## Empty if !HAVE_X_WINDOWS
+## xfont.o ftfont.o xftfont.o ftxfont.o if HAVE_XFT
+## xfont.o ftfont.o ftxfont.o if HAVE_FREETYPE
+## else xfont.o
 FONT_OBJ=@FONT_OBJ@
 
 ## Used if HAVE_MOUSE.
@@ -257,6 +295,10 @@ DEPFLAGS = -MMD -MF deps/$*.d
 /* If NS_IMPL_GNUSTEP, some definitions and includes are expanded here.  */
 @NS_IMPL_GNUSTEP_INC@
 
+/* FIXME move to LD_SWITCH_SYSTEM_TEMACS?
+   This uses ${CONFIG_SYSTEM_LIBS}, presumably set by the above include.  */
+NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@
+
 /* DO NOT use -R.  There is a special hack described in lastfile.c
    which is used instead.  Some initialized data areas are modified
    at initial startup, then labeled as part of the text area when
@@ -286,15 +328,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
 #endif
         $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
-#ifdef HAVE_X_WINDOWS
-OLDXMENU=@OLDXMENU@
-LIBXMENU=@LIBXMENU@
-LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
-LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
-LIBX_OTHER=@LIBX_OTHER@
-FONT_DRIVERS=$(FONT_OBJ)
-#endif /* HAVE_X_WINDOWS */
-
 
 /* A macro which other sections of Makefile can redefine to munge the
    flags before they are passed to LD.  This is helpful if you have
@@ -336,6 +369,12 @@ LD=ld
 
 #endif /* not ORDINARY_LINK */
 
+
+#ifdef NS_IMPL_GNUSTEP
+LD=$(CC) -rdynamic
+#endif
+
+
 /* lastfile must follow all files whose initialized data areas should
    be dumped as pure by dump-emacs.  */
 obj=    dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
@@ -351,7 +390,7 @@ obj=    dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
         process.o callproc.o \
         region-cache.o sound.o atimer.o \
         doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \
-        $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS)
+        $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ)
 
 /* Object files used on some machine or other.
    These go in the DOC file on all machines in case they are needed.  */
@@ -360,31 +399,25 @@ SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
   fontset.o dbusbind.o \
   nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
   w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
-  w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS)
-
-gmallocobj =
-rallocobj =
-vmlimitobj =
-#ifndef SYSTEM_MALLOC
-#ifndef DOUG_LEA_MALLOC
-gmallocobj = gmalloc.o
-#endif
+  w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_OBJ)
 
-#ifdef REL_ALLOC
-rallocobj = ralloc.o
-#endif
+/* gmalloc.o if !SYSTEM_MALLOC && !DOUG_LEA_MALLOC, else empty.  */
+GMALLOC_OBJ=@GMALLOC_OBJ@
+
+/* vm-limit.o if !SYSTEM_MALLOC, else empty.  */
+VMLIMIT_OBJ=@VMLIMIT_OBJ@
 
-vmlimitobj = vm-limit.o
-#endif /* !SYSTEM_MALLOC */
+/* ralloc.o if !SYSTEM_MALLOC && REL_ALLOC, else empty.  */
+RALLOC_OBJ=@RALLOC_OBJ@
 
 /* Empty on Cygwin, lastfile.o elsewhere.  */
 PRE_ALLOC_OBJ=@PRE_ALLOC_OBJ@
-/* lastfile.o vm-limit.o on Cygwin, $vmlimitobj elsewhere.  */
+/* lastfile.o on Cygwin, empty elsewhere.  */
 POST_ALLOC_OBJ=@POST_ALLOC_OBJ@
 
 /* List of object files that make-docfile should not be told about.  */
-otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \
-  $(POST_ALLOC_OBJ) $(WIDGET_OBJ) $(LIBOBJS)
+otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \
+  $(POST_ALLOC_OBJ) $(VMLIMIT_OBJ) $(WIDGET_OBJ) $(LIBOBJS)
 
 /* This is the platform-specific list of Lisp files loaded into the
    dumped Emacs.  It is arranged like this because it is easier to generate
@@ -611,6 +644,7 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
 
 all: emacs${EXEEXT} $(OTHER_FILES)
 
+/* Does anyone ever pay attention to the load-path-shadows output here?  */
 emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp}
 #ifdef CANNOT_DUMP
         rm -f emacs${EXEEXT}
@@ -648,55 +682,42 @@ ${libsrc}make-docfile${EXEEXT}:
 buildobj.h: Makefile
         echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h
 
-/* FIXME LOCALCPP not defined or mentioned anywhere.  */
-temacs${EXEEXT}: $(LOCALCPP) $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
-#ifdef NS_IMPL_GNUSTEP
-        $(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
-        -L$(GNUSTEP_SYSTEM_LIBRARIES) -lgnustep-gui -lgnustep-base \
-        -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread ) -o temacs \
-        ${obj} ${otherobj} ${LIBES}
-#else
-        $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
-    -o temacs ${START_FILES} ${obj} ${otherobj}  \
-    ${LIBES}
-#endif
+temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
+        $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
+          ${NS_IMPL_GNUSTEP_TEMACS_LDFLAGS} ) \
+          ${TEMACS_LDFLAGS2} \
+          -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}
 
 prefix-args${EXEEXT}: prefix-args.o $(config_h)
         $(CC) $(LDFLAGS) prefix-args.o -o prefix-args
 
-#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK)
-
-/* We use stamp-xmenu with these two deps to both ensure that lwlib
-   gets remade based on its dependencies in its own makefile,
-   and remake temacs if lwlib gets changed by this.  */
-stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU)
-        touch stamp-oldxmenu
-/* Supply an ordering for parallel make.  */
-../src/$(OLDXMENU): ${OLDXMENU}
-
-#ifdef USE_X_TOOLKIT
-$(OLDXMENU): really-lwlib
 
+/* Only (possibly) used if HAVE_X11 && !USE_GTK, but no harm in always
+   defining.  */
 really-lwlib:
         cd ${lwlibdir}; ${MAKE} ${MFLAGS} \
     CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}'
         @true  /* make -t should not create really-lwlib.  */
 .PHONY: really-lwlib
-#else /* not USE_X_TOOLKIT */
-$(OLDXMENU): really-oldXMenu
 
 really-oldXMenu:
         cd ${oldXMenudir}; ${MAKE} ${MFLAGS} \
     CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}'
         @true  /* make -t should not create really-oldXMenu.  */
 .PHONY: really-oldXMenu
-#endif /* not USE_X_TOOLKIT */
-#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! USE_GTK) */
 
-/* We don''t really need this, but satisfy the dependency.  */
-stamp-oldxmenu:
+/* We don''t really need this when OLDXMENU_DEPS is empty, but as
+   things stand we need something to satisfy the temacs dependency.  */
+stamp-oldxmenu: ${OLDXMENU_DEPS}
         touch stamp-oldxmenu
-#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! USE_GTK) */
+
+/* HAVE_X11 implies HAVE_X_WINDOWS and HAVE_MENUS.  */
+#if defined (HAVE_X11) && ! defined (USE_GTK)
+/* Supply an ordering for parallel make.  */
+../src/$(OLDXMENU): ${OLDXMENU}
+
+$(OLDXMENU): $(OLDXMENU_TARGET)
+#endif /* HAVE_X11 && !USE_GTK */ 
 
 ../config.status:: epaths.in
         @echo "The file epaths.h needs to be set up from epaths.in."
@@ -972,20 +993,16 @@ textprop.o: textprop.c buffer.h window.h $(INTERVALS_H) \
 ${ns_appdir}: ${ns_appsrc}
         rm -fr ${ns_appdir}
         mkdir -p ${ns_appdir}
-        ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; tar xf - )
-        ( cd ${ns_appdir} ; for subdir in `find . -type d ! -name CVS -print` ; do \
-                chmod a+rx $${subdir} ; \
-                rm -rf $${subdir}/CVS ; \
-                rm -f  $${subdir}/.cvsignore ; done ; )
+        ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; umask 022; tar xf - )
+#endif /* HAVE_NS */
 
+/* These are only used if HAVE_NS, but no harm in always defining them.  */
 ${ns_appbindir}Emacs: emacs${EXEEXT}
         mkdir -p ${ns_appbindir}
         cp -f emacs${EXEEXT} ${ns_appbindir}Emacs
 
 ns-app: ${ns_appdir} ${ns_appbindir}Emacs
 
-#endif /* HAVE_NS */
-
 mostlyclean:
         rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a
         rm -f ../etc/DOC
@@ -994,9 +1011,8 @@ mostlyclean:
 clean: mostlyclean
         rm -f emacs-*.*.*${EXEEXT} emacs${EXEEXT}
         -rm -rf deps
-#ifdef HAVE_NS
-        rm -fr ${ns_appdir}
-#endif
+        test "X${ns_appdir}" = "X" || rm -rf ${ns_appdir}
+
 /* bootstrap-clean is used to clean up just before a bootstrap.
    It should remove all files generated during a compilation/bootstrap,
    but not things like config.status or TAGS.  */
@@ -1076,7 +1092,9 @@ tags: TAGS TAGS-LISP $(lwlibdir)TAGS
 /* Since the .el.elc rule cannot specify an extra dependency, we do it here.  */
 ${lisp} ${SOME_MACHINE_LISP}: $(BOOTSTRAPEMACS)
 
-${lispsource}loaddefs.el: $(BOOTSTRAPEMACS)
+/* VCSWITNESS points to the file that holds info about the current checkout.
+   We use it as a heuristic to decide when to rebuild loaddefs.el.  */
+${lispsource}loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS)
         cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS=${bootstrap_exe}
 
 /* Dump an Emacs executable named bootstrap-emacs containing the
diff --git a/src/bidi.c b/src/bidi.c
index d4c7d2451d7..dbc95608fea 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -26,13 +26,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    designed to be called once for every character in the buffer or
    string.
 
-   The main entry point is bidi_get_next_char_visually.  Each time it
+   The main entry point is bidi_move_to_visually_next.  Each time it
    is called, it finds the next character in the visual order, and
    returns its information in a special structure.  The caller is then
    expected to process this character for display or any other
-   purposes, and call bidi_get_next_char_visually for the next
-   character.  See the comments in bidi_get_next_char_visually for
-   more details about its algorithm that finds the next visual-order
+   purposes, and call bidi_move_to_visually_next for the next
+   character.  See the comments in bidi_move_to_visually_next for more
+   details about its algorithm that finds the next visual-order
    character by resolving their levels on the fly.
 
    The two other entry points are bidi_paragraph_init and
@@ -540,9 +540,11 @@ bidi_copy_it (struct bidi_it *to, struct bidi_it *from)
 
 /* Caching the bidi iterator states.  */
 
-static struct bidi_it bidi_cache[1000]; /* FIXME: make this dynamically allocated! */
-static int bidi_cache_idx;
-static int bidi_cache_last_idx;
+#define BIDI_CACHE_CHUNK 200
+static struct bidi_it *bidi_cache;
+static size_t bidi_cache_size = 0;
+static int bidi_cache_idx;      /* next unused cache slot */
+static int bidi_cache_last_idx; /* slot of last cache hit */
 
 static INLINE void
 bidi_cache_reset (void)
@@ -552,6 +554,17 @@ bidi_cache_reset (void)
 }
 
 static INLINE void
+bidi_cache_shrink (void)
+{
+  if (bidi_cache_size > BIDI_CACHE_CHUNK)
+    {
+      bidi_cache_size = BIDI_CACHE_CHUNK * sizeof (struct bidi_it);
+      bidi_cache = (struct bidi_it *) xrealloc (bidi_cache, bidi_cache_size);
+    }
+  bidi_cache_reset ();
+}
+
+static INLINE void
 bidi_cache_fetch_state (int idx, struct bidi_it *bidi_it)
 {
   int current_scan_dir = bidi_it->scan_dir;
@@ -672,9 +685,13 @@ bidi_cache_iterator_state (struct bidi_it *bidi_it, int resolved)
   if (idx < 0)
     {
       idx = bidi_cache_idx;
-      /* Don't overrun the cache limit.  */
-      if (idx > sizeof (bidi_cache) / sizeof (bidi_cache[0]) - 1)
-        abort ();
+      /* Enlarge the cache as needed.  */
+      if (idx >= bidi_cache_size)
+        {
+          bidi_cache_size += BIDI_CACHE_CHUNK * sizeof (struct bidi_it);
+          bidi_cache =
+            (struct bidi_it *) xrealloc (bidi_cache, bidi_cache_size);
+        }
       /* Character positions should correspond to cache positions 1:1.
          If we are outside the range of cached positions, the cache is
          useless and must be reset.  */
@@ -873,6 +890,9 @@ bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it)
       EMACS_INT pos;
       bidi_type_t type;
 
+      if (!bidi_initialized)
+        bidi_initialize ();
+
       /* If we are inside a paragraph separator, we are just waiting
          for the separator to be exhausted; use the previous paragraph
          direction.  But don't do that if we have been just reseated,
@@ -896,11 +916,6 @@ bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it)
          middle of it.  Find where this paragraph starts.  */
       bytepos = bidi_find_paragraph_start (pos, bytepos);
 
-      /* We should always be at the beginning of a new line at this
-         point.  */
-      if (!(bytepos == BEGV_BYTE || FETCH_CHAR (bytepos - 1) == '\n'))
-        abort ();
-
       bidi_it->separator_limit = -1;
       bidi_it->new_paragraph = 0;
       ch = FETCH_CHAR (bytepos);
@@ -940,7 +955,7 @@ bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it)
   /* Contrary to UAX#9 clause P3, we only default the paragraph
      direction to L2R if we have no previous usable paragraph
      direction.  */
-  if (bidi_it->paragraph_dir == NEUTRAL_DIR)
+  if (bidi_it->paragraph_dir != L2R && bidi_it->paragraph_dir != R2L)
     bidi_it->paragraph_dir = L2R; /* P3 and ``higher protocols'' */
   if (bidi_it->paragraph_dir == R2L)
     bidi_it->level_stack[0].level = 1;
@@ -990,6 +1005,7 @@ bidi_init_it (EMACS_INT charpos, EMACS_INT bytepos, struct bidi_it *bidi_it)
     bidi_it->prev_for_neutral.type_after_w1 =
     bidi_it->prev_for_neutral.orig_type = UNKNOWN_BT;
   bidi_it->sor = L2R;    /* FIXME: should it be user-selectable? */
+  bidi_cache_shrink ();
 }
 
 /* Push the current embedding level and override status; reset the
@@ -1876,7 +1892,7 @@ bidi_find_other_level_edge (struct bidi_it *bidi_it, int level, int end_flag)
 }
 
 void
-bidi_get_next_char_visually (struct bidi_it *bidi_it)
+bidi_move_to_visually_next (struct bidi_it *bidi_it)
 {
   int old_level, new_level, next_level;
   struct bidi_it sentinel;
diff --git a/src/charset.c b/src/charset.c
index 18c0bbb6310..f83fa994536 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -567,7 +567,6 @@ load_charset_map_from_file (charset, mapfile, control_flag)
       n_entries++;
     }
   fclose (fp);
-  close (fd);
 
   load_charset_map (charset, head, n_entries, control_flag);
   SAFE_FREE ();
diff --git a/src/cmds.c b/src/cmds.c
index 5d450fe9a13..b8a65324e9f 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -57,8 +57,12 @@ DEFUN ("forward-point", Fforward_point, Sforward_point, 1, 1, 0,
 }
 
 DEFUN ("forward-char", Fforward_char, Sforward_char, 0, 1, "^p",
-       doc: /* Move point right N characters (left if N is negative).
-On reaching end of buffer, stop and signal error.  */)
+       doc: /* Move point N characters forward (backward if N is negative).
+On reaching end or beginning of buffer, stop and signal error.
+
+Depending on the bidirectional context, the movement may be to the
+right or to the left on the screen.  This is in contrast with
+\\[right-arrow-command], which see.  */)
      (n)
      Lisp_Object n;
 {
@@ -93,8 +97,12 @@ On reaching end of buffer, stop and signal error.  */)
 }
 
 DEFUN ("backward-char", Fbackward_char, Sbackward_char, 0, 1, "^p",
-       doc: /* Move point left N characters (right if N is negative).
-On attempt to pass beginning or end of buffer, stop and signal error.  */)
+       doc: /* Move point N characters backward (forward if N is negative).
+On attempt to pass beginning or end of buffer, stop and signal error.
+
+Depending on the bidirectional context, the movement may be to the
+right or to the left on the screen.  This is in contrast with
+\\[left-arrow-command], which see.  */)
      (n)
      Lisp_Object n;
 {
diff --git a/src/composite.c b/src/composite.c
index cbfb4aa66d3..f392053bac9 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1150,13 +1150,13 @@ composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string)
       /* Search backward for a pattern that may be composed and the
          position of (possibly) the last character of the match is
          closest to (but not after) START.  The reason for the last
-         character is that set_iterator_to_next works in reverse order
-         and, thus we must stop at the last character for composition
+         character is that set_iterator_to_next works in reverse order,
+         and thus we must stop at the last character for composition
          check.  */
       unsigned char *p;
       int len;
-      /* limit byte position used in fast_looking_at.  This is the
-         byte position of the next character of START. */
+      /* Limit byte position used in fast_looking_at.  This is the
+         byte position of the character after START. */
       EMACS_INT limit;
 
       if (NILP (string))
@@ -1191,7 +1191,7 @@ composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string)
                     len = 1;
                   if (len > 0)
                     {
-                      /* Make CPOS points the last character of match.
+                      /* Make CPOS point to the last character of match.
                          Note that LEN is byte-length.  */
                       bpos += len;
                       if (NILP (string))
diff --git a/src/config.in b/src/config.in
index 35530943682..99a95d7f15d 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1179,8 +1179,6 @@ typedef unsigned size_t;
 
 #ifdef HAVE_X11R6
 #define HAVE_X_I18N
-#elif !defined X11R5_INHIBIT_I18N
-#define HAVE_X_I18N
 #endif
 
 /* Define HAVE_X11R6_XIM if we have usable X11R6-style XIM support.  */
@@ -1200,11 +1198,7 @@ typedef unsigned size_t;
    that the stack is continuous.  */
 #ifdef __GNUC__
 #  ifndef GC_SETJMP_WORKS
-  /* GC_SETJMP_WORKS is nearly always appropriate for GCC --
-     see NON_SAVING_SETJMP in the target descriptions.  */
-  /* Exceptions (see NON_SAVING_SETJMP in target description) are
-     SCO5 non-ELF (but Emacs specifies ELF) and SVR3 on x86.
-     Fixme: Deal with SVR3.  */
+  /* GC_SETJMP_WORKS is nearly always appropriate for GCC.  */
 #    define GC_SETJMP_WORKS 1
 #  endif
 #  ifndef GC_LISP_OBJECT_ALIGNMENT
diff --git a/src/dispextern.h b/src/dispextern.h
index 1b631493705..8e8da36daea 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2868,7 +2868,7 @@ extern EMACS_INT tool_bar_button_relief;
 /* Defined in bidi.c */
 
 extern void bidi_init_it P_ ((EMACS_INT, EMACS_INT, struct bidi_it *));
-extern void bidi_get_next_char_visually P_ ((struct bidi_it *));
+extern void bidi_move_to_visually_next P_ ((struct bidi_it *));
 extern void bidi_paragraph_init P_ ((bidi_dir_t, struct bidi_it *));
 extern int  bidi_mirror_char P_ ((int));
 
diff --git a/src/emacs.c b/src/emacs.c
index 6b19b45d0b0..c0ef926da75 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -87,6 +87,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 #endif
 
+const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
+const char emacs_version[] = "24.0.50";
+
 extern void malloc_warning P_ ((char *));
 extern void set_time_zone_rule P_ ((char *));
 #ifdef HAVE_INDEX
@@ -180,6 +183,10 @@ Lisp_Object Vprevious_system_messages_locale;
 Lisp_Object Vsystem_time_locale;
 Lisp_Object Vprevious_system_time_locale;
 
+/* Copyright and version info.  The version number may be updated by
+   Lisp code.  */
+Lisp_Object Vemacs_copyright, Vemacs_version;
+
 /* If non-zero, emacs should not attempt to use a window-specific code,
    but instead should use the virtual terminal under which it was started.  */
 int inhibit_window_system;
@@ -802,35 +809,43 @@ main (int argc, char **argv)
   argc = 0;
   while (argv[argc]) argc++;
 
-  if (argmatch (argv, argc, "-version", "--version", 3, NULL, &skip_args)
-      /* We don't know the version number unless this is a dumped Emacs.
-         So ignore --version otherwise.  */
-      && initialized)
+  if (argmatch (argv, argc, "-version", "--version", 3, NULL, &skip_args))
     {
-      Lisp_Object tem, tem2;
-      tem = Fsymbol_value (intern_c_string ("emacs-version"));
-      tem2 = Fsymbol_value (intern_c_string ("emacs-copyright"));
-      if (!STRINGP (tem))
-        {
-          fprintf (stderr, "Invalid value of `emacs-version'\n");
-          exit (1);
-        }
-      if (!STRINGP (tem2))
+      const char *version, *copyright;
+      if (initialized)
         {
-          fprintf (stderr, "Invalid value of `emacs-copyright'\n");
-          exit (1);
+          Lisp_Object tem, tem2;
+          tem = Fsymbol_value (intern_c_string ("emacs-version"));
+          tem2 = Fsymbol_value (intern_c_string ("emacs-copyright"));
+          if (!STRINGP (tem))
+            {
+              fprintf (stderr, "Invalid value of `emacs-version'\n");
+              exit (1);
+            }
+          if (!STRINGP (tem2))
+            {
+              fprintf (stderr, "Invalid value of `emacs-copyright'\n");
+              exit (1);
+            }
+          else
+            {
+              version = SDATA (tem);
+              copyright = SDATA (tem2);
+            }
         }
       else
         {
-          printf ("GNU Emacs %s\n", SDATA (tem));
-          printf ("%s\n", SDATA(tem2));
-          printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n");
-          printf ("You may redistribute copies of Emacs\n");
-          printf ("under the terms of the GNU General Public License.\n");
-          printf ("For more information about these matters, ");
-          printf ("see the file named COPYING.\n");
-          exit (0);
+          version = emacs_version;
+          copyright = emacs_copyright;
         }
+      printf ("GNU Emacs %s\n", version);
+      printf ("%s\n", copyright);
+      printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n");
+      printf ("You may redistribute copies of Emacs\n");
+      printf ("under the terms of the GNU General Public License.\n");
+      printf ("For more information about these matters, ");
+      printf ("see the file named COPYING.\n");
+      exit (0);
     }
   if (argmatch (argv, argc, "-chdir", "--chdir", 2, &ch_to_dir, &skip_args))
       if (chdir (ch_to_dir) == -1)
@@ -1528,6 +1543,11 @@ main (int argc, char **argv)
     ns_init_paths ();
 #endif
 
+  /* Initialize and GC-protect Vinitial_environment and
+     Vprocess_environment before set_initial_environment fills them
+     in.  */
+  if (!initialized)
+    syms_of_callproc ();
   /* egetenv is a pretty low-level facility, which may get called in
      many circumstances; it seems flimsy to put off initializing it
      until calling init_callproc.  */
@@ -1577,7 +1597,6 @@ main (int argc, char **argv)
       syms_of_callint ();
       syms_of_casefiddle ();
       syms_of_casetab ();
-      syms_of_callproc ();
       syms_of_category ();
       syms_of_ccl ();
       syms_of_character ();
@@ -2577,6 +2596,14 @@ This is nil during initialization.  */);
                doc: /* If non-nil, X resources, Windows Registry settings, and NS defaults are not used.  */);
   inhibit_x_resources = 0;
 
+  DEFVAR_LISP ("emacs-copyright", &Vemacs_copyright,
+               doc: /* Short copyright string for this version of Emacs.  */);
+  Vemacs_copyright = build_string (emacs_copyright);
+
+  DEFVAR_LISP ("emacs-version", &Vemacs_version,
+               doc: /* Version numbers of this version of Emacs.  */);
+  Vemacs_version = build_string (emacs_version);
+
   /* Make sure IS_DAEMON starts up as false.  */
   daemon_pipe[1] = 0;
 }
diff --git a/src/eval.c b/src/eval.c
index 2a0330acc38..199c4705736 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3308,6 +3308,21 @@ grow_specpdl ()
   specpdl_ptr = specpdl + count;
 }
 
+/* specpdl_ptr->symbol is a field which describes which variable is
+   let-bound, so it can be properly undone when we unbind_to.
+   It can have the following two shapes:
+   - SYMBOL : if it's a plain symbol, it means that we have let-bound
+     a symbol that is not buffer-local (at least at the time
+     the let binding started).  Note also that it should not be
+     aliased (i.e. when let-binding V1 that's aliased to V2, we want
+     to record V2 here).
+   - (SYMBOL WHERE . BUFFER) : this means that it is a let-binding for
+     variable SYMBOL which can be buffer-local.  WHERE tells us
+     which buffer is affected (or nil if the let-binding affects the
+     global value of the variable) and BUFFER tells us which buffer was
+     current (i.e. if WHERE is non-nil, then BUFFER==WHERE, otherwise
+     BUFFER did not yet have a buffer-local value).  */
+
 void
 specbind (symbol, value)
      Lisp_Object symbol, value;
@@ -3339,7 +3354,10 @@ specbind (symbol, value)
             set_internal (symbol, value, Qnil, 1);
           break;
         }
-    case SYMBOL_LOCALIZED: case SYMBOL_FORWARDED:
+    case SYMBOL_LOCALIZED:
+      if (SYMBOL_BLV (sym)->frame_local)
+        error ("Frame-local vars cannot be let-bound");
+    case SYMBOL_FORWARDED:
       {
         Lisp_Object ovalue = find_symbol_value (symbol);
         specpdl_ptr->func = 0;
@@ -3376,6 +3394,7 @@ specbind (symbol, value)
             /* FIXME: The third value `current_buffer' is only used in
                let_shadows_buffer_binding_p which is itself only used
                in set_internal for local_if_set.  */
+            eassert (NILP (where) || EQ (where, cur_buf));
             specpdl_ptr->symbol = Fcons (symbol, Fcons (where, cur_buf));
 
             /* If SYMBOL is a per-buffer variable which doesn't have a
@@ -3460,13 +3479,10 @@ unbind_to (count, value)
             Fset_default (symbol, this_binding.old_value);
           /* If `where' is non-nil, reset the value in the appropriate
              local binding, but only if that binding still exists.  */
-          else if (BUFFERP (where))
-            {
-              if (BUFFERP (where)
-                  ? !NILP (Flocal_variable_p (symbol, where))
-                  : !NILP (Fassq (symbol, XFRAME (where)->param_alist)))
-                set_internal (symbol, this_binding.old_value, where, 1);
-            }
+          else if (BUFFERP (where)
+                   ? !NILP (Flocal_variable_p (symbol, where))
+                   : !NILP (Fassq (symbol, XFRAME (where)->param_alist)))
+            set_internal (symbol, this_binding.old_value, where, 1);
         }
       /* If variable has a trivial value (no forwarding), we can
          just set it.  No need to check for constant symbols here,
diff --git a/src/lisp.h b/src/lisp.h
index 7d329cc754c..b4ff446b064 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -310,11 +310,10 @@ LISP_MAKE_RVALUE (Lisp_Object o)
     return o;
 }
 #else
-/* This isn't quite right - it keeps the argument as an lvalue.
-   Making it const via casting would help avoid code actually
-   modifying the location in question, but the casting could cover
-   other type-related bugs.  */
-#define LISP_MAKE_RVALUE(o) (o)
+/* This is more portable to pre-C99 non-GCC compilers, but for
+   backwards compatibility GCC still accepts an old GNU extension
+   which caused this to only generate a warning.  */
+#define LISP_MAKE_RVALUE(o) (0 ? (o) : (o))
 #endif
 
 #else /* USE_LISP_UNION_TYPE */
@@ -1461,9 +1460,9 @@ struct Lisp_Float
   };
 
 #ifdef HIDE_LISP_IMPLEMENTATION
-#define XFLOAT_DATA(f)  (XFLOAT (f)->u.data_ + 0)
+#define XFLOAT_DATA(f)  (0 ? XFLOAT (f)->u.data_ : XFLOAT (f)->u.data_)
 #else
-#define XFLOAT_DATA(f)  (XFLOAT (f)->u.data + 0)
+#define XFLOAT_DATA(f)  (0 ? XFLOAT (f)->u.data :  XFLOAT (f)->u.data)
 /* This should be used only in alloc.c, which always disables
    HIDE_LISP_IMPLEMENTATION.  */
 #define XFLOAT_INIT(f,n) (XFLOAT (f)->u.data = (n))
diff --git a/src/m/ia64.h b/src/m/ia64.h
index acf6c25844f..03ec37b4269 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -48,11 +48,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Convert that into an integer that is 100 for a load average of 1.0  */
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
-#ifdef __ELF__
-#undef UNEXEC
-#define UNEXEC unexelf.o
-#endif
-
 #ifndef NOT_C_CODE
 
 #ifdef REL_ALLOC
diff --git a/src/m/template.h b/src/m/template.h
index 9b8d2d63055..2807cd913ec 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -69,11 +69,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    reasonable place to select for it is in the machine description file.  */
 #define NO_SOCK_SIGIO
 
-/* After adding support for a new system, modify the large case
-   statement in the `configure' script to recognize reasonable
+/* After adding support for a new machine, modify the large case
+   statement in configure.in to recognize reasonable
    configuration names, and add a description of the system to
    `etc/MACHINES'.
 
+   Check for any tests of $machine in configure.in, and add an entry
+   for the new machine if needed.
+
    If you've just fixed a problem in an existing configuration file,
    you should also check `etc/MACHINES' to make sure its descriptions
    of known problems in that configuration should be updated.  */
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 3aa2dc16f42..674f00f1d09 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -97,7 +97,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* This is used in list_system_processes.  */
 #define HAVE_PROCFS 1
 
-
 /* Define CLASH_DETECTION if you want lock files to be written
    so that Emacs can tell instantly when you try to modify
    a file that someone else has modified in his Emacs.  */
@@ -126,11 +125,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
   ((FILE)->_pptr - (FILE)->_pbase)
 #endif /* !_IO_STDIO_H && ! __UCLIBC__ */
-#endif /* emacs */
 
-#ifdef emacs
 #define INTERRUPT_INPUT
-#endif
+#endif /* emacs */
 
 #define SYSV_SYSTEM_DIR       /* use dirent.h */
 
@@ -147,11 +144,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define NARROWPROTO 1
 
-/* Use mmap directly for allocating larger buffers.  */
-#ifdef DOUG_LEA_MALLOC
-#undef REL_ALLOC
-#endif
-
 /* Tell that garbage collector that setjmp is known to save all
    registers relevant for conservative garbage collection in the jmp_buf.  */
 /* Not all the architectures are tested, but there are Debian packages
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 9f6fe52a5de..cb4c4a9d807 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -1,6 +1,7 @@
 /* Definitions file for GNU Emacs running on the GNU Hurd.
-   Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -28,11 +29,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define SIGNALS_VIA_CHARACTERS
 
-/* Use mmap directly for allocating larger buffers.  */
-#ifdef DOUG_LEA_MALLOC
-#undef REL_ALLOC
-#endif
-
 /* GNU needs its own crt0, and libc defines data_start.  */
 #define ORDINARY_LINK
 #define DATA_START ({ extern int data_start; (char *) &data_start; })
diff --git a/src/s/template.h b/src/s/template.h
index 16df03092d2..f355d67b8c6 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -133,10 +133,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* ============================================================ */
 
 /* After adding support for a new system, modify the large case
-   statement in the `configure' script to recognize reasonable
+   statement in configure.in to recognize reasonable
    configuration names, and add a description of the system to
    `etc/MACHINES'.
 
+   Check for any tests of $opsys in configure.in, and add an entry
+   for the new system if needed.
+
    If you've just fixed a problem in an existing configuration file,
    you should also check `etc/MACHINES' to make sure its descriptions
    of known problems in that configuration should be updated.  */
diff --git a/src/xdisp.c b/src/xdisp.c
index 16936b977fd..6b3097c9a1a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -184,7 +184,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    reordering engine which is called by set_iterator_to_next and
    returns the next character to display in the visual order.  See
    commentary on bidi.c for more details.  As far as redisplay is
-   concerned, the effect of calling bidi_get_next_char_visually, the
+   concerned, the effect of calling bidi_move_to_visually_next, the
    main interface of the reordering engine, is that the iterator gets
    magically placed on the buffer or string position that is to be
    displayed next.  In other words, a linear iteration through the
@@ -3918,7 +3918,7 @@ handle_invisible_prop (it)
                 }
               do
                 {
-                  bidi_get_next_char_visually (&it->bidi_it);
+                  bidi_move_to_visually_next (&it->bidi_it);
                 }
               while (it->stop_charpos <= it->bidi_it.charpos
                      && it->bidi_it.charpos < newpos);
@@ -5276,7 +5276,7 @@ iterate_out_of_display_property (it)
   while (it->bidi_it.charpos >= BEGV
          && it->prev_stop <= it->bidi_it.charpos
          && it->bidi_it.charpos < CHARPOS (it->position))
-    bidi_get_next_char_visually (&it->bidi_it);
+    bidi_move_to_visually_next (&it->bidi_it);
   /* Record the stop_pos we just crossed, for when we cross it
      back, maybe.  */
   if (it->bidi_it.charpos > CHARPOS (it->position))
@@ -6307,29 +6307,14 @@ set_iterator_to_next (it, reseat_p)
           else if (! it->cmp_it.reversed_p)
             {
               /* Composition created while scanning forward.  */
-              /* Update IT's char/byte positions to point the first
+              /* Update IT's char/byte positions to point to the first
                  character of the next grapheme cluster, or to the
                  character visually after the current composition.  */
-#if 0
-              /* Is it ok to do this directly? */
-              IT_CHARPOS (*it) += it->cmp_it.nchars;
-              IT_BYTEPOS (*it) += it->cmp_it.nbytes;
-#else
-              /* Or do we have to call bidi_get_next_char_visually
-                 repeatedly (perhaps not to confuse some internal
-                 state of bidi_it)?  At least we must do this if we
-                 have consumed all grapheme clusters in the current
-                 composition because the next character will be in the
-                 different bidi level.  */
               for (i = 0; i < it->cmp_it.nchars; i++)
-                bidi_get_next_char_visually (&it->bidi_it);
-              /* BTW, it seems that the name
-                 bidi_get_next_char_visually is confusing because
-                 it sounds like not advancing character position.
-                 How about bidi_set_iterator_to_next? */
+                bidi_move_to_visually_next (&it->bidi_it);
               IT_BYTEPOS (*it) = it->bidi_it.bytepos;
               IT_CHARPOS (*it) = it->bidi_it.charpos;
-#endif
+
               if (it->cmp_it.to < it->cmp_it.nglyphs)
                 {
                   /* Proceed to the next grapheme cluster.  */
@@ -6337,7 +6322,7 @@ set_iterator_to_next (it, reseat_p)
                 }
               else
                 {
-                  /* No more grapheme cluster in this composition.
+                  /* No more grapheme clusters in this composition.
                      Find the next stop position.  */
                   EMACS_INT stop = it->stop_charpos;
                   if (it->bidi_it.scan_dir < 0)
@@ -6351,10 +6336,10 @@ set_iterator_to_next (it, reseat_p)
           else
             {
               /* Composition created while scanning backward.  */
-              /* Update IT's char/byte positions to point the last
+              /* Update IT's char/byte positions to point to the last
                  character of the previous grapheme cluster, or the
                  character visually after the current composition.  */
-              bidi_get_next_char_visually (&it->bidi_it);
+              bidi_move_to_visually_next (&it->bidi_it);
               IT_BYTEPOS (*it) = it->bidi_it.bytepos;
               IT_CHARPOS (*it) = it->bidi_it.charpos;
 
@@ -6365,7 +6350,7 @@ set_iterator_to_next (it, reseat_p)
                 }
               else
                 {
-                  /* No more grapheme cluster in this composition.
+                  /* No more grapheme clusters in this composition.
                      Find the next stop position.  */
                   EMACS_INT stop = it->stop_charpos;
                   if (it->bidi_it.scan_dir < 0)
@@ -6393,13 +6378,13 @@ set_iterator_to_next (it, reseat_p)
                  direction (a.k.a. its base embedding level).  */
               if (it->bidi_it.new_paragraph)
                 bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
-              bidi_get_next_char_visually (&it->bidi_it);
+              bidi_move_to_visually_next (&it->bidi_it);
               IT_BYTEPOS (*it) = it->bidi_it.bytepos;
               IT_CHARPOS (*it) = it->bidi_it.charpos;
               if (prev_scan_dir != it->bidi_it.scan_dir)
                 {
-                  /* As scan direction was changed, we must re-compute
-                     the stop position for composition.  */
+                  /* As the scan direction was changed, we must
+                     re-compute the stop position for composition.  */
                   EMACS_INT stop = it->stop_charpos;
                   if (it->bidi_it.scan_dir < 0)
                     stop = -1;
@@ -6873,7 +6858,7 @@ next_element_from_buffer (it)
           /* If we are at the beginning of a line, we can produce the
              next element right away.  */
           bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
-          bidi_get_next_char_visually (&it->bidi_it);
+          bidi_move_to_visually_next (&it->bidi_it);
         }
       else
         {
@@ -6891,7 +6876,7 @@ next_element_from_buffer (it)
             {
               /* Now return to buffer position where we were asked to
                  get the next display element, and produce that.  */
-              bidi_get_next_char_visually (&it->bidi_it);
+              bidi_move_to_visually_next (&it->bidi_it);
             }
           while (it->bidi_it.bytepos != orig_bytepos
                  && it->bidi_it.bytepos < ZV_BYTE);
@@ -7115,7 +7100,7 @@ next_element_from_composition (it)
               /* Resync the bidi iterator with IT's new position.
                  FIXME: this doesn't support bidirectional text.  */
               while (it->bidi_it.charpos < IT_CHARPOS (*it))
-                bidi_get_next_char_visually (&it->bidi_it);
+                bidi_move_to_visually_next (&it->bidi_it);
             }
           return 0;
         }
@@ -7131,7 +7116,7 @@ next_element_from_composition (it)
              correct (struct glyph)->charpos.  */
           int i;
           for (i = 0; i < it->cmp_it.nchars - 1; i++)
-            bidi_get_next_char_visually (&it->bidi_it);
+            bidi_move_to_visually_next (&it->bidi_it);
           IT_CHARPOS (*it) = it->bidi_it.charpos;
           IT_BYTEPOS (*it) = it->bidi_it.bytepos;
           it->position = it->current.pos;
@@ -18256,6 +18241,84 @@ display_line (it)
   return row->displays_text_p;
 }
 
+DEFUN ("current-bidi-paragraph-direction", Fcurrent_bidi_paragraph_direction,
+       Scurrent_bidi_paragraph_direction, 0, 1, 0,
+       doc: /* Return paragraph direction at point in BUFFER.
+Value is either `left-to-right' or `right-to-left'.
+If BUFFER is omitted or nil, it defaults to the current buffer.
+
+Paragraph direction determines how the text in the paragraph is displayed.
+In left-to-right paragraphs, text begins at the left margin of the window
+and the reading direction is generally left to right.  In right-to-left
+paragraphs, text begins at the right margin and is read from right to left.
+
+See also `bidi-paragraph-direction'.  */)
+     (buffer)
+     Lisp_Object buffer;
+{
+  struct buffer *buf;
+  struct buffer *old;
+
+  if (NILP (buffer))
+    buf = current_buffer;
+  else
+    {
+      CHECK_BUFFER (buffer);
+      buf = XBUFFER (buffer);
+      old = current_buffer;
+    }
+
+  if (NILP (buf->bidi_display_reordering))
+    return Qleft_to_right;
+  else if (!NILP (buf->bidi_paragraph_direction))
+    return buf->bidi_paragraph_direction;
+  else
+    {
+      /* Determine the direction from buffer text.  We could try to
+         use current_matrix if it is up to date, but this seems fast
+         enough as it is.  */
+      struct bidi_it itb;
+      EMACS_INT pos = BUF_PT (buf);
+      EMACS_INT bytepos = BUF_PT_BYTE (buf);
+
+      if (buf != current_buffer)
+        set_buffer_temp (buf);
+      /* Find previous non-empty line.  */
+      if (pos >= ZV && pos > BEGV)
+        {
+          pos--;
+          bytepos = CHAR_TO_BYTE (pos);
+        }
+      while (FETCH_BYTE (bytepos) == '\n')
+        {
+          if (bytepos <= BEGV_BYTE)
+            break;
+          bytepos--;
+          pos--;
+        }
+      while (!CHAR_HEAD_P (FETCH_BYTE (bytepos)))
+        bytepos--;
+      itb.charpos = pos;
+      itb.bytepos = bytepos;
+      itb.first_elt = 1;
+
+      bidi_paragraph_init (NEUTRAL_DIR, &itb);
+      if (buf != current_buffer)
+        set_buffer_temp (old);
+      switch (itb.paragraph_dir)
+        {
+        case L2R:
+          return Qleft_to_right;
+          break;
+        case R2L:
+          return Qright_to_left;
+          break;
+        default:
+          abort ();
+        }
+    }
+}
+
 
 
 /***********************************************************************
@@ -25955,6 +26018,7 @@ syms_of_xdisp ()
 #endif
   defsubr (&Sformat_mode_line);
   defsubr (&Sinvisible_p);
+  defsubr (&Scurrent_bidi_paragraph_direction);
 
   staticpro (&Qmenu_bar_update_hook);
   Qmenu_bar_update_hook = intern_c_string ("menu-bar-update-hook");