From: Stefan Monnier Date: Tue, 11 May 2010 21:02:32 +0000 (-0400) Subject: Merge from emacs-23 X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~211^2~11 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=587e4b13796f78ed582f36ff8b2ea261c6902b6f;p=emacs.git Merge from emacs-23 --- 587e4b13796f78ed582f36ff8b2ea261c6902b6f diff --cc src/ChangeLog index 8bac6573c23,8e2774f2a03..35b5153649a --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,36 -1,17 +1,41 @@@ -2010-05-11 Eli Zaretskii - - * makefile.w32-in ($(BLD)/w32fns.$(O)): Depend on $(SRC)/w32.h. - - * w32fns.c: Include w32.h. - (Fw32_shell_execute): Decode the error message before passing it - to `error'. (Bug#6126) - + 2010-05-11 Karel Klic + + * ftfont.c: Fix incorrect parentheses of #if condition for + definining M17N_FLT_USE_NEW_FEATURE. + -2010-05-07 Chong Yidong +2010-05-11 Glenn Morris + + * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. + * s/msdos.h (MSDOS_LIBS_SYSTEM): Remove. + +2010-05-10 Eli Zaretskii + + * 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. + +2010-05-10 Glenn Morris + + * Makefile.in (LIBS_SYSTEM): Set using configure, not cpp. + (LIBS_SYSTEM) [MSDOS]: Reset with MSDOS_LIBS_SYSTEM. + (LIBES): Use LIBS_SYSTEM as a variable. + * s/msdos.h (LIBS_SYSTEM): Rename to MSDOS_LIBS_SYSTEM. Always define. + * s/aix4-2.h (LIBS_SYSTEM): + * s/freebsd.h (LIBS_SYSTEM): + * s/hpux10-20.h (LIBS_SYSTEM): + * s/sol2-6.h (LIBS_SYSTEM): + * s/unixware.h (LIBS_SYSTEM): + Move to configure. + + * s/aix4-2.h (MAIL_USE_LOCKF): + * s/bsd-common.h (MAIL_USE_FLOCK): + * s/darwin.h (MAIL_USE_FLOCK): + * s/gnu-linux.h (MAIL_USE_FLOCK): + * s/irix6-5.h (MAIL_USE_FLOCK): + * s/template.h (MAIL_USE_FLOCK): + Move to configure. + +2010-05-08 Chong Yidong * Version 23.2 released.