Mercurial > emacs

changeset 108963:35ec0301a751

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Synch with Gnus trunk. (gnus-mime-buttonized-part-id): New internal variable. (gnus-article-edit-part): Bind it to make last part that is substituted or deleted visible. (gnus-mime-display-single): Buttonize part of which id equals to gnus-mime-buttonized-part-id.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Thu, 10 Jun 2010 05:54:25 +0000
parents 43f8ac6763d9 (diff) 98ae5d8b7b72 (current diff)
children da553d450193 8929f83798c1 c4f0520279b5
files
diffstat 9 files changed, 35 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jun 10 05:33:55 2010 +0000
+++ b/.hgtags	Thu Jun 10 05:54:25 2010 +0000
@@ -32,6 +32,7 @@
 1290d63e6ab3ab9e82f2fd0a35c436d05b2e0861 ttn-vms-21-2-B4
 136de3bfa14feaa22a4f959b4273a6ba46a21f76 libc-960211
 14a47b65c288d095f4b98a840ff8671eb8f893fe tmp_pcl_tag_131034C
+14f1ff916f19fdbaa1ca42dc9dde418bba829d3e EMACS_PRETEST_23_1_95
 1550283d0e53c078b71a91aadadd33ab575ac4ae EMACS_22_1
 15c6663e567613de3e6f1a495c12a30402c2c32e zsh-merge-ognus-1
 18f3cb26243f96e95636c2c9857f16bdb153dda7 before-miles-orphaned-changes
@@ -562,6 +563,7 @@
 72276b334084264b708d0e34ad447735c4ce5e22 libc20x-970319
 72276b334084264b708d0e34ad447735c4ce5e22 libc20x-970404
 72276b334084264b708d0e34ad447735c4ce5e22 root-libc-2_0_x-branch
+72f8f4f82b9d27158cd49fd93249f503a2d29228 EMACS_PRETEST_23_1_94
 7361b2115a770c0597610e2c87c0a27de4fa66e0 libc-961121
 73b00b4dd2a6a44d3e03aaf764c0c761f35a32e6 EMACS_PRETEST_21_0_93
 75519a692473ba53cd5c01b411717dd3043e11cd libc_1_09
@@ -885,6 +887,7 @@
 b9483b592728f369b212714efb929c5f9a2fcbb2 libc-960321
 bfc0a609e15a1240a53e580cca2d37ca049e7399 libc-951206
 bfc852aa5b34546929e12d73d920518010fd12bc EMACS_PRETEST_22_1_91
+bfc8980754ed5b8ba76061deadab49dc41e7d7dd EMACS_23_2
 c17fd465ea95fc615961c63088385865705ca8a3 libc-970911
 c17fd465ea95fc615961c63088385865705ca8a3 libc-970912
 c17fd465ea95fc615961c63088385865705ca8a3 libc-970913
@@ -1003,6 +1006,7 @@
 c17fd465ea95fc615961c63088385865705ca8a3 libc-980127
 c17fd465ea95fc615961c63088385865705ca8a3 libc-980128
 c296bfdefcc3e065cdbfe4820fad8bc45e8c824d EMACS_PRETEST_21_0_105
+c3a1d1b47790cdd266fa8dd5b560f94a981266de EMACS_PRETEST_23_1_96
 c47ea87f3bd75650205a60bd22a77ac5c594ce15 libc-970715
 c4bf2875d07244697fba32d82fda761b6d3c296d libc-970506
 c4bf2875d07244697fba32d82fda761b6d3c296d libc-970507
@@ -1019,6 +1023,7 @@
 d0e3ea40717c5b4a2d6c98104885828d69d1793f EMACS_23_1_BASE
 d1641e2dfc5bf66c0747230159fec66f382d8c47 Boehm-GC-base
 d2548396ceddd157578a78683d41a83f25b7c0f3 EMACS_PRETEST_23_0_92
+d4caa51ddfe29f3c5db72f3cf9ced08bf53b12cd EMACS_PRETEST_23_1_97
 d5cbb3a06adcf5683a55d3aebcda44ed39699264 libc-970325
 d5cbb3a06adcf5683a55d3aebcda44ed39699264 libc-970326
 d5cbb3a06adcf5683a55d3aebcda44ed39699264 libc-970327
--- a/ChangeLog	Thu Jun 10 05:33:55 2010 +0000
+++ b/ChangeLog	Thu Jun 10 05:54:25 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:54:25 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:54:25 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:54:25 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:54:25 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:54:25 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:54:25 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:54:25 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);
 }