view admin/make-changelog-diff @ 96674:ff312a846b25 before-merge-emacs-app-to-trunk

* w32fns.c (Fx_create_frame): Remove duplicate unwind_protect. (w32_show_hourglass): Rename from show_hourglass. (w32_hide_hourglass): Rename from hide_hourglass. (DEFAULT_HOURGLASS_DELAY): Revert from last change. (Vhourglass_delay): Declare extern. (hourglass_started): Remove. * xdisp.c (Vhourglass_delay): Remove static. (hourglass_started, start_hourglass, cancel_hourglass): Don't include these versions on WINDOWSNT.

#! /bin/bash

## Author: Francesco Potorti` <[e-mail]>

if [ $# -ne 2 ]; then
    echo "usage: $0 TAG1 TAG2" >&2
    exit 1
fi

if [ ! -f INSTALL -o ! -f configure -o ! -d lib-src ]; then
    echo "this script should be run in the emacs root directory" >&2
    exit 2
fi

cvs -q diff -b -r $1 -r $2 $(find -name ChangeLog|sort) |
    sed -n -e 's/^=\+/======/p' -e 's/^> //p' -e 's/^diff.*//p' \
	-e 's/^RCS file: .cvsroot.emacs.emacs.\(.*\),v/\1/p' |
    sed -n -e "/^======$/ {
                N
                N
                h
                d
               }
               H
               s/.*//
               x
               s/^\n//
	       p"

# arch-tag: 7604a259-40b4-4f97-86b2-496a9c546f0a