Mercurial > emacs
changeset 109402:c4f0520279b5
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 10 Jun 2010 05:59:12 +0000 |
| parents | 98ae5d8b7b72 (current diff) 35ec0301a751 (diff) |
| children | 681cd08dc0f7 |
| files | |
| diffstat | 8 files changed, 30 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jun 10 05:33:55 2010 +0000 +++ b/ChangeLog Thu Jun 10 05:59:12 2010 +0000 @@ -1,3 +1,9 @@ +2010-06-10 Glenn Morris <rgm@gnu.org> + + * Makefile.in (install-arch-indep): Gzip the info files too. + + * make-dist: Remove references to non-existent directories and files. + 2010-06-08 Dan Nicolaescu <dann@ics.uci.edu> * configure.in: Include <strings.h> and <string.h> instead of
--- a/Makefile.in Thu Jun 10 05:33:55 2010 +0000 +++ b/Makefile.in Thu Jun 10 05:59:12 2010 +0000 @@ -580,6 +580,8 @@ for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \ chmod a+r $(DESTDIR)${infodir}/$$f; \ + [ -n "${GZIP_PROG}" ] && \ + ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \ done; \ done); \ else true; fi
--- a/admin/notes/newfile Thu Jun 10 05:33:55 2010 +0000 +++ b/admin/notes/newfile Thu Jun 10 05:59:12 2010 +0000 @@ -17,8 +17,6 @@ ** Make the ChangeLog entry in the name of the author(s), not your own name. -** If appropriate, add an entry to lisp/Makefile.in ELCFILES. - ** If appropriate, check that the file compiles OK and that Emacs builds fine with it. Address any compilation warnings.
--- a/lisp/ChangeLog Thu Jun 10 05:33:55 2010 +0000 +++ b/lisp/ChangeLog Thu Jun 10 05:59:12 2010 +0000 @@ -1,3 +1,8 @@ +2010-06-10 Glenn Morris <rgm@gnu.org> + + * emacs-lisp/authors.el (authors-ignored-files) + (authors-valid-file-names): Add some files. + 2010-06-10 Stefan Monnier <monnier@iro.umontreal.ca> * net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve
--- a/lisp/emacs-lisp/authors.el Thu Jun 10 05:33:55 2010 +0000 +++ b/lisp/emacs-lisp/authors.el Thu Jun 10 05:59:12 2010 +0000 @@ -266,7 +266,7 @@ "3B-MAXMEM" "AIX.DUMP" "SUN-SUPPORT" "XENIX" "CODINGS" "CHARSETS" "calc/INSTALL" "calc/Makefile" - "vms-pp.trans" "_emacs" "batcomp.com" + "vms-pp.trans" "_emacs" "batcomp.com" "notes/cpp" ; admin/ ;; MH-E stuff not in Emacs: "import-emacs" "release-utils" ;; Erc stuff not in Emacs: @@ -505,6 +505,7 @@ "getdate.y" "ymakefile" "permute-index" "index.perm" + "ibmrs6000.inp" "emacs.ico" "emacs21.ico" "LPF" "LEDIT" "OTHER.EMACSES"
--- a/make-dist Thu Jun 10 05:33:55 2010 +0000 +++ b/make-dist Thu Jun 10 05:59:12 2010 +0000 @@ -281,7 +281,7 @@ (cd lisp; files=`echo [!=]*.el | sed -e 's/ subdirs.el / /' -e 's/ default.el / /'` for dir in [!=]*; do - if [ -d $dir ] && [ $dir != term ] && [ $dir != CVS ] && [ $dir != RCS ] + if [ -d $dir ] && [ $dir != term ] then echo $dir thisdir=`echo $dir/[!=]*.el | sed -e 's/ subdirs.el / /'` @@ -383,7 +383,7 @@ ## Find all subdirs of lisp dir for file in `find . -type d -print`; do case $file in - . | .. | */Old | */CVS | */RCS | */=*) + . | .. | */=*) ;; *) if [ -d $file ]; then @@ -580,7 +580,7 @@ ### Don't distribute = files, TAGS, DOC files, backups, autosaves, or ### tex litter. (cd etc - files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$' \ + files=`ls -d * | grep -v '^e$' \ | grep -v '^charsets$' | grep -v '^gnus$' | grep -v '^images$' | grep -v '^nxml$' \ | grep -v '^refcards$' | grep -v '^tutorials$'| grep -v '^schema$'` ln $files ../${tempdir}/etc @@ -608,7 +608,7 @@ for dir in etc/charsets etc/e etc/gnus etc/nxml etc/tutorials etc/refcards etc/schema ; do echo "Making links to \`${dir}'" (cd ${dir} - ln `ls -d * | grep -v CVS | grep -v RCS` ../../${tempdir}/${dir} + ln `ls -d *` ../../${tempdir}/${dir} cd ../../${tempdir}/${dir} rm -f *~ \#*\# *,v =* core) done @@ -642,7 +642,7 @@ etc/images/smilies/grayscale etc/images/smilies/medium; do echo "Making links to \`${dir}'" (cd ${dir} - ln `ls -d * | grep -v CVS | grep -v RCS` ../../../../${tempdir}/${dir} + ln `ls -d *` ../../../../${tempdir}/${dir} cd ../../../../${tempdir}/${dir} rm -f *~ \#*\# *,v =* core) done @@ -651,7 +651,7 @@ etc/images/icons/hicolor/*/mimetypes; do echo "Making links to \`${dir}'" (cd ${dir} - ln `ls -d * | grep -v CVS | grep -v RCS` ../../../../../../${tempdir}/${dir} + ln `ls -d *` ../../../../../../${tempdir}/${dir} cd ../../../../../../${tempdir}/${dir} rm -f *~ \#*\# *,v =* core) done @@ -659,7 +659,7 @@ echo "Making links to \`info'" # Don't distribute backups or autosaves. (cd info - ln `find . -type f -print | grep -v CVS | grep -v RCS | grep -v cvsignore` ../${tempdir}/info + ln `find . -type f -print` ../${tempdir}/info #ln [a-zA-Z]* ../${tempdir}/info cd ../${tempdir}/info # Avoid an error when expanding the wildcards later.
--- a/src/ChangeLog Thu Jun 10 05:33:55 2010 +0000 +++ b/src/ChangeLog Thu Jun 10 05:59:12 2010 +0000 @@ -1,5 +1,7 @@ 2010-06-10 Glenn Morris <rgm@gnu.org> + * editfns.c (Fbyte_to_string): Pacify compiler. + * m/ibms390x.h: Rather than duplicating ibms390.h, just include it. 2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca>
--- a/src/editfns.c Thu Jun 10 05:33:55 2010 +0000 +++ b/src/editfns.c Thu Jun 10 05:59:12 2010 +0000 @@ -1,7 +1,8 @@ /* Lisp functions pertaining to editing. - Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996, - 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -225,8 +226,9 @@ (byte) Lisp_Object byte; { + unsigned char b; CHECK_NUMBER (byte); - unsigned char b = XINT (byte); + b = XINT (byte); return make_string_from_bytes (&b, 1, 1); }