view admin/diff-tar-files @ 70145:00cb3fe5fed5

* mh-tool-bar.el (image-load-path): Define to shush compiler. (mh-buffer-exists-p): Move inside mh-do-in-gnu-emacs since it isn't used outside of it. (mh-tool-bar-folder-buttons-init, mh-tool-bar-letter-buttons-init): Update load-path/image-load-path before setting buttons. This code used to be in mh-folder-mode/mh-letter-mode but this was the wrong place since mh-tool-bar-*-buttons-init can also be called when customizing the buttons. (mh-tool-bar-update): New function which updates tool-bar-map in all of the MH-E buffers after customizing the buttons (closes SF #1452718). (mh-tool-bar-folder-buttons-set, mh-tool-bar-letter-buttons-set): Call it (closes SF #1452718). * mh-folder.el (mh-folder-buttons-init-flag): Delete. Use mh-folder-tool-bar-map instead. (image-load-path): Delete. No longer used. (mh-folder-mode): Moved setting of image-load-path into mh-tool-bar-folder-buttons-init. * mh-letter.el (mh-letter-buttons-init-flag): Delete. Use mh-letter-tool-bar-map instead. (image-load-path): Delete. No longer used. (mh-letter-mode): Moved setting of image-load-path into mh-tool-bar-letter-buttons-init. * mh-seq.el (mh-narrow-to-seq, mh-widen): Use with-current-buffer instead of set-buffer.

#! /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