view admin/diff-tar-files @ 90503:8e3ffc0a529f

(QCscalable, Qc, Qm, Qp, Qd): New variables. (syms_of_font): Initialize them. (font_pixel_size): Allow float value in dpi. (font_prop_validate_type): Deleted. (font_prop_validate_symbol, font_prop_validate_style): Argument changed. Caller changed. (font_prop_validate_non_neg): Renamed from font_prop_validate_size. (font_prop_validate_extra): Deleted. (font_prop_validate_spacing): New function. (font_property_table): Add elements for all known properties. (get_font_prop_index): Renamed from check_font_prop_name. New argument FROM. Caller changed. (font_prop_validate): Validate all known properties. (font_put_extra): Argument force deleted. Caller changed. (font_expand_wildcards): Make it static. Fix the way of shrinking the possible range. (font_parse_xlfd): Arguemnt merge deleted. Fix handling of RESX, RESY, SPACING, and AVGWIDTH. Don't validate property values here. Caller changed. (font_unparse_xlfd): Handle dpi, spacing, and scalable properties. (font_parse_fcname): Arguemnt merge deleted. Fix parsing of point size. Don't validate properties values here. Caller changed. (font_unparse_fcname): Handle dpi, spacing, and scalable properties. (font_open_by_name): Delete unused variable. (Ffont_spec): Likewise. Validate property values. (Ffont_match_p): New function.

#! /bin/sh

# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
# GNU Emacs is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Emacs is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with GNU Emacs; see the file COPYING.  If not, write to the
# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.

if [ $# != 2 ]; then
    cat <<EOF
Usage: $0 OLD-TAR NEW-TAR

Print a diff of the files in OLD-TAR and NEW-TAR.  Used for checking
the contents of Emacs tar files.
EOF
    exit 1;
fi

old_tar=$1
new_tar=$2

old_tmp=/tmp/old.$$
new_tmp=/tmp/new.$$
trap "rm -f $old_tmp $new_tmp; exit 1" 1 2 15

tar tzf $old_tar | sed -e 's,^[^/]*,,' | sort > $old_tmp
tar tzf $new_tar | sed -e 's,^[^/]*,,' | sort > $new_tmp
diff -u $old_tmp $new_tmp
rm -f $new_tmp $old_tmp


# arch-tag: ef2c96e2-ea67-4668-925c-d9a6f3d205cf