* bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.

[bpt/emacs.git] / make-dist

diff --git a/make-dist b/make-dist
index a641042..283defe 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -83,10 +83,6 @@ while [ $# -gt 0 ]; do
     "--bzip2")
       default_gzip="bzip2"
     ;;
-    ## Same with lzma.
-    "--lzma")
-      default_gzip="lzma"
-    ;;
     ## Same with xz.
     "--xz")
       default_gzip="xz"
@@ -107,7 +103,6 @@ while [ $# -gt 0 ]; do
       echo ""
       echo "  --bzip2  use bzip2 instead of gzip"
       echo "  --clean-up       delete staging directories when done"
-      echo "  --lzma   use lzma instead of gzip"
       echo "  --xz             use xz instead of gzip"
       echo "  --no-compress    don't compress"
       echo "  --newer=TIME     don't include files older than TIME"
@@ -518,7 +513,6 @@ if [ "${make_tar}" = yes ]; then
   fi
   case "${default_gzip}" in
     bzip2) gzip_extension=.bz2 ;;
-    lzma)  gzip_extension=.lzma ;;
     xz)  gzip_extension=.xz ;;
     gzip)  gzip_extension=.gz ; default_gzip="gzip --best";;
        *)  gzip_extension= ;;