view admin/diff-tar-files @ 105923:1011707400d3

* menu.c (Fx_popup_menu): Consolidate versions from xmenu.c, w32menu.c, and nsmenu.m. Simplify the obsolete case where position is nil. (cleanup_popup_menu): New function, moved from nsmenu.m. (struct skp): Remove slot `notreal'. (single_keymap_panes, keymap_panes): Remove arg `notreal' and adjust callers. (single_menu_item): Adjust call to parse_menu_item. (syms_of_menu): Defsubr x-popup-menu. * menu.h (Vmenu_updating_frame): Consolidate declarations from *menu.c. (keymap_panes): Don't export any more. (mouse_position_for_popup, w32_menu_show, ns_menu_show, xmenu_show): Declare. * keyboard.c (parse_menu_item): Remove arg `notreal'. (menu_bar_item, read_char_minibuf_menu_prompt): Adjust callers. * keyboard.h (parse_menu_item): Update declaration. * xmenu.c (Fx_popup_menu): Remove. (syms_of_xmenu): Don't defsubr x-popup-menu. * w32menu.c (Fx_popup_menu): Remove. (syms_of_w32menu): Don't defsubr x-popup-menu. * nsmenu.m (cleanup_popup_menu): Remove. (ns_menu_show): Rename from ns_popup_menu and remove all the code moved to menu.c's Fx_popup_menu. (Fx_popup_menu): Remove. (syms_of_nsmenu): Don't defsubr x-popup-menu, and don't initialize menu_items (it's done in menu.c already).

#! /bin/sh

# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
#   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 3 of the License, 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.  If not, see <http://www.gnu.org/licenses/>.


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