From: Miles Bader Date: Wed, 29 Aug 2007 05:03:40 +0000 (+0000) Subject: Merge from emacs--devo--0 X-Git-Tag: emacs-pretest-23.0.90~8295^2~344 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1bb9a689acfe821e0aa777ddf4e074556c7817a1;p=emacs.git Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 857-865) - Update from CVS - Merge from emacs--rel--22 - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file. - Remove RCS keywords * emacs--rel--22 (patch 97-100) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 246-247) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-252 --- 1bb9a689acfe821e0aa777ddf4e074556c7817a1 diff --cc configure index 622af8f87b8,24f3a5cc677..c8382e4bf2c --- a/configure +++ b/configure @@@ -679,6 -679,6 +679,7 @@@ INSTALL_DAT RANLIB INSTALL_INFO GZIP_PROG ++MAKEINFO LIBSOUND PKG_CONFIG ALSA_CFLAGS @@@ -1348,11 -1342,10 +1351,12 @@@ Optional Packages --with-tiff use -ltiff for displaying TIFF images --with-gif use -lgif (or -lungif) for displaying GIF images --with-png use -lpng for displaying PNG images + --with-freetype use -lfreetype for local fonts support + --with-xft use -lXft for anti aliased fonts --with-gpm use -lgpm for mouse support on a GNU/Linux console + --with-rsvg use -lrsvg-2 for displaying SVG images --with-gtk use GTK (same as --with-x-toolkit=gtk) - --with-pkg-config-prog Path to pkg-config to use for finding GTK + --with-pkg-config-prog Path to pkg-config to use for finding GTK and librsvg --without-toolkit-scroll-bars don't use Motif or Xaw3d scroll bars --without-xim don't use X11 XIM @@@ -5351,6 -5330,6 +5361,61 @@@ f ++## Need makeinfo >= 4.6 (?) to build the manuals. ++# Extract the first word of "makeinfo", so it can be a program name with args. ++set dummy makeinfo; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_MAKEINFO+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $MAKEINFO in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_MAKEINFO="$MAKEINFO" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_MAKEINFO="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_MAKEINFO" && ac_cv_path_MAKEINFO="no" ++ ;; ++esac ++fi ++MAKEINFO=$ac_cv_path_MAKEINFO ++if test -n "$MAKEINFO"; then ++ { echo "$as_me:$LINENO: result: $MAKEINFO" >&5 ++echo "${ECHO_T}$MAKEINFO" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++if test "$MAKEINFO" != "no" && \ ++ test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[^0-9]*([5-9]|4\.[6-9])'`" = x; then ++ MAKEINFO=no ++fi ++ ++if test "$MAKEINFO" = "no"; then ++ { { echo "$as_me:$LINENO: error: makeinfo >= 4.6 is required " >&5 ++echo "$as_me: error: makeinfo >= 4.6 is required " >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ ++ if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x then ac_link="$ac_link $GCC_LINK_TEST_OPTIONS" @@@ -14510,13 -14253,13 +14699,13 @@@ if test "${HAVE_X11}" = "yes"; the MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no" if test "X${MISSING}" != X; then -- { { echo "$as_me:$LINENO: error: The following required libraries was not found: ++ { { echo "$as_me:$LINENO: error: The following required libraries were not found: $MISSING Maybe some development libraries/packages are missing? If you don't want to link with them give $WITH_NO as options to configure" >&5 --echo "$as_me: error: The following required libraries was not found: ++echo "$as_me: error: The following required libraries were not found: $MISSING Maybe some development libraries/packages are missing? If you don't want to link with them give @@@ -24657,6 -24405,6 +24847,7 @@@ INSTALL_DATA!$INSTALL_DATA$ac_deli RANLIB!$RANLIB$ac_delim INSTALL_INFO!$INSTALL_INFO$ac_delim GZIP_PROG!$GZIP_PROG$ac_delim ++MAKEINFO!$MAKEINFO$ac_delim LIBSOUND!$LIBSOUND$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim @@@ -24688,9 -24431,14 +24881,6 @@@ version!$version$ac_deli configuration!$configuration$ac_delim canonical!$canonical$ac_delim srcdir!$srcdir$ac_delim --lispdir!$lispdir$ac_delim --locallisppath!$locallisppath$ac_delim --lisppath!$lisppath$ac_delim -x_default_search_path!$x_default_search_path$ac_delim -etcdir!$etcdir$ac_delim -archlibdir!$archlibdir$ac_delim -bitmapdir!$bitmapdir$ac_delim -gamedir!$gamedir$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@@ -24732,11 -24480,6 +24922,14 @@@ _ACEO ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF ++lispdir!$lispdir$ac_delim ++locallisppath!$locallisppath$ac_delim ++lisppath!$lisppath$ac_delim +x_default_search_path!$x_default_search_path$ac_delim +etcdir!$etcdir$ac_delim +archlibdir!$archlibdir$ac_delim +bitmapdir!$bitmapdir$ac_delim +gamedir!$gamedir$ac_delim gameuser!$gameuser$ac_delim c_switch_system!$c_switch_system$ac_delim c_switch_machine!$c_switch_machine$ac_delim @@@ -24750,7 -24493,7 +24943,7 @@@ carbon_appdir!$carbon_appdir$ac_deli LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --cc configure.in index 88a2216cde1,b4f8b07d7a6..690e0348746 --- a/configure.in +++ b/configure.in @@@ -108,12 -108,10 +108,14 @@@ AC_ARG_WITH(gif [ --with-gif use -lgif (or -lungif) for displaying GIF images]) AC_ARG_WITH(png, [ --with-png use -lpng for displaying PNG images]) +AC_ARG_WITH(freetype, +[ --with-freetype use -lfreetype for local fonts support]) +AC_ARG_WITH(xft, +[ --with-xft use -lXft for anti aliased fonts]) AC_ARG_WITH(gpm, [ --with-gpm use -lgpm for mouse support on a GNU/Linux console]) + AC_ARG_WITH(rsvg, + [ --with-rsvg use -lrsvg-2 for displaying SVG images]) AC_ARG_WITH(gtk, [ --with-gtk use GTK (same as --with-x-toolkit=gtk)]) AC_ARG_WITH(pkg-config-prog, diff --cc lisp/emacs-lisp/cl-loaddefs.el index 4a0c17c0a4c,a46fead6eb5..433daad7911 --- a/lisp/emacs-lisp/cl-loaddefs.el +++ b/lisp/emacs-lisp/cl-loaddefs.el @@@ -283,10 -283,10 +283,10 @@@ Not documente ;;;;;; do* do loop return-from return block etypecase typecase ecase ;;;;;; case load-time-value eval-when destructuring-bind function* ;;;;;; defmacro* defun* gentemp gensym cl-compile-time-init) "cl-macs" -;;;;;; "cl-macs.el" "d1c9f68f599fbec644a06dd5cf520fb5") +;;;;;; "cl-macs.el" "6990af555f962480552cf0867f3d5bab") ;;; Generated autoloads from cl-macs.el - (autoload (quote cl-compile-time-init) "cl-macs" "\ + (autoload 'cl-compile-time-init "cl-macs" "\ Not documented \(fn)" nil nil) diff --cc make-dist index 2c77940002a,54cd3aca9d8..99f2d791101 --- a/make-dist +++ b/make-dist @@@ -317,11 -317,12 +317,12 @@@ for subdir in lisp site-lisp lispref li leim/SKK-DIC leim/ja-dic leim/quail \ src src/m src/s src/bitmaps lib-src oldXMenu lwlib \ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ - etc etc/e \ + etc etc/charsets etc/e \ etc/images etc/images/ezimage etc/images/gnus etc/images/gud \ etc/images/icons etc/images/low-color etc/images/mail \ - etc/images/smilies etc/tree-widget etc/tree-widget/default \ - etc/tree-widget/folder info man m4 msdos vms mac mac/inc \ + etc/images/smilies etc/images/tree-widget \ + etc/images/tree-widget/default etc/images/tree-widget/folder \ + etc/refcards etc/tutorials info man m4 msdos vms mac mac/inc \ mac/inc/sys mac/src mac/Emacs.app mac/Emacs.app/Contents \ mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \ mac/Emacs.app/Contents/Resources/English.lproj @@@ -572,7 -573,7 +573,7 @@@ echo "Making links to \`etc' ### Don't distribute gfdl.1, since no man page references it. (cd etc files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$' \ - | grep -v '^charsets$' | grep -v '^images$' | grep -v '^tree-widget$'` - | grep -v '^images$' | grep -v '^refcards$' | grep -v '^tutorials$'` ++ | grep -v '^charsets$' | grep -v '^images$' | grep -v '^refcards$' | grep -v '^tutorials$'` ln $files ../${tempdir}/etc ## If we ended up with a symlink, or if we did not get anything ## due to a cross-device symlink, copy the file. @@@ -595,17 -596,13 +596,13 @@@ rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core rm -f TAGS) - echo "Making links to \`etc/charsets'" - (cd etc/charsets - ln `ls -d * | grep -v CVS | grep -v RCS` ../../${tempdir}/etc/charsets - cd ../../${tempdir}/etc/charsets - rm -f *~ \#*\# *,v =* core) - - echo "Making links to \`etc/e'" - (cd etc/e - ln `ls -d * | grep -v CVS | grep -v RCS` ../../${tempdir}/etc/e - cd ../../${tempdir}/etc/e - rm -f *~ \#*\# *,v =* core) -for dir in etc/e etc/tutorials etc/refcards ; do ++for dir in etc/charsets etc/e etc/tutorials etc/refcards ; do + echo "Making links to \`${dir}'" + (cd ${dir} + ln `ls -d * | grep -v CVS | grep -v RCS` ../../${tempdir}/${dir} + cd ../../${tempdir}/${dir} + rm -f *~ \#*\# *,v =* core) + done echo "Making links to \`etc/images'" (cd etc/images diff --cc src/Makefile.in index f4d548b7460,d34c272faa4..217e9846e23 --- a/src/Makefile.in +++ b/src/Makefile.in @@@ -282,7 -281,7 +282,7 @@@ TOOLKIT_DEFINES /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM since it may have -I options that should override those two. */ - ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ -ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${CFLAGS} ++ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ .c.o: $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< @@@ -949,11 -949,10 +952,11 @@@ SOME_MACHINE_LISP = ${dotdot}/lisp/mous Note that SunOS needs -lm to come before -lc; otherwise, you get duplicated symbols. If the standard libraries were compiled with GCC, we might need gnulib again after them. */ - LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) LIBGPM \ + LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) LIBGPM \ LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ - LIBS_DEBUG $(GETLOADAVG_LIBS) $(GNULIB_VAR) LIB_MATH LIB_STANDARD \ - $(GNULIB_VAR) + LIBS_DEBUG $(GETLOADAVG_LIBS) \ + @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ \ + $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR) /* Enable recompilation of certain other files depending on system type. */ diff --cc src/lread.c index fcc344d5875,a67fff1fc92..6bec084c5c6 --- a/src/lread.c +++ b/src/lread.c @@@ -1082,10 -910,12 +1096,15 @@@ Return t if the file exists and loads s tmp)) : found) ; + version = -1; ++ + /* Check fore the presence of old-style quotes and warn about them. */ + specbind (Qold_style_backquotes, Qnil); + record_unwind_protect (load_warn_old_style_backquotes, file); + if (!bcmp (SDATA (found) + SBYTES (found) - 4, - ".elc", 4)) + ".elc", 4) + || (version = safe_to_load_p (fd)) > 0) /* Load .elc files directly, but not when they are remote and have no handler! */ {