Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-91

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 581-597)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 133-141)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - Update from CVS: texi/gnus.texi (RSS): Fix key description.
   - Update from CVS: texi/gnus.texi (Document Server Internals): Addition.

1 files changed, 12 insertions, 9 deletions

diff --git a/make-dist b/make-dist
index 3381ee770eb..d2563e16a5d 100755
--- a/make-dist
+++ b/make-dist
@@ -218,13 +218,6 @@ then
     echo "${bogosities}"
   fi
   rm -f /tmp/el /tmp/elc
-
-  ### Check for .el files that would overflow the 14-char limit if compiled.
-  long=`find lisp leim -name '[a-zA-Z0-9]??????????*.el' -print`
-  if [ "$long" != "" ]; then
-    echo "The following .el file names are too long:"
-    echo "$long"
-  fi
 fi
 
 ### Make sure configure is newer than configure.in.
@@ -322,6 +315,7 @@ for subdir in lisp site-lisp lispref lispintro \
               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/images etc/images/gnus etc/images/smilies \
+              etc/images/mail etc/images/ezimage \
               etc/tree-widget etc/tree-widget/default etc/tree-widget/folder \
               info man m4 msdos vms mac mac/inc mac/inc/sys \
               mac/src mac/Emacs.app mac/Emacs.app/Contents \
@@ -599,8 +593,17 @@ echo "Making links to \`etc/e'"
  cd ../../${tempdir}/etc/e
  rm -f *~ \#*\# *,v =* core)
 
-for dir in etc/images/gnus etc/images/smilies \
-           etc/tree-widget/default etc/tree-widget/folder ; do
+echo "Making links to \`etc/images'"
+(cd etc/images
+ for img in [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do
+   if [ -f $img ]; then
+     ln $img ../../${tempdir}/etc/images
+   fi
+ done)
+
+for dir in etc/images/gnus etc/images/smilies etc/images/mail \
+           etc/images/ezimage etc/tree-widget/default \
+           etc/tree-widget/folder ; do
     echo "Making links to \`${dir}'"
     (cd ${dir}
      ln `ls -d * | grep -v CVS | grep -v RCS` ../../../${tempdir}/${dir}