view admin/diff-tar-files @ 64220:38b6647b9ed4

(custom-push-theme): Maintain list of the settings of a given theme in its theme-settings property. Maintain position of old settings in the theme-value or theme-face property. (custom-enabled-themes): New variable. (custom-theme-enabled-p): New function. (provide-theme): Update custom-enabled-themes. Disable and reenable the `user' theme. (require-theme): Doc fix. (custom-do-theme-reset, custom-remove-theme): Functions deleted. (custom-theme-value, custom-theme-variable-value): Likewise. (custom-theme-reset-internal): Likewise. (custom-theme-load-themes): Fix bugs and use custom-disable-theme. (custom-enable-theme, custom-disable-theme): New functions. (custom-variable-theme-value, custom-face-theme-value): Likewise. (custom-theme-recalc-variable, custom-theme-recalc-face): Likewise. (custom-theme-reset-variables): Simplify. (deftheme, custom-declare-theme, custom-make-theme-feature): Definitions moved.

#! /bin/sh

# Copyright (C) 2001 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