merge trunk

1 files changed, 127 insertions, 7 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)