annotate admin/diff-tar-files @ 108979:6d1b80d173b3

Add all rgb.txt color names to x-colors. * facemenu.el (list-colors-print): Don't print extra names if it will overflow the window width. * term/common-win.el (x-colors): Add all the color names defined in rgb.txt (Bug#6332).
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 12 Jun 2010 13:12:15 -0400
parents 1d1d5d9bd884
children 376148b31b5e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
39058
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1 #! /bin/sh
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
2
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100971
diff changeset
3 # Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
75348
3d45362f1d38 Add 2007 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 74439
diff changeset
4 # Free Software Foundation, Inc.
94833
e6db9ee945b8 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79744
diff changeset
5
39058
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
6 # This file is part of GNU Emacs.
94833
e6db9ee945b8 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79744
diff changeset
7
e6db9ee945b8 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79744
diff changeset
8 # GNU Emacs is free software: you can redistribute it and/or modify
39058
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
9 # it under the terms of the GNU General Public License as published by
94833
e6db9ee945b8 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79744
diff changeset
10 # the Free Software Foundation, either version 3 of the License, or
e6db9ee945b8 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79744
diff changeset
11 # (at your option) any later version.
e6db9ee945b8 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79744
diff changeset
12
39058
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
13 # GNU Emacs is distributed in the hope that it will be useful,
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
14 # but WITHOUT ANY WARRANTY; without even the implied warranty of
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
16 # GNU General Public License for more details.
94833
e6db9ee945b8 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79744
diff changeset
17
39058
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
18 # You should have received a copy of the GNU General Public License
94833
e6db9ee945b8 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79744
diff changeset
19 # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
e6db9ee945b8 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79744
diff changeset
20
39058
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
21
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
22 if [ $# != 2 ]; then
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
23 cat <<EOF
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
24 Usage: $0 OLD-TAR NEW-TAR
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
25
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
26 Print a diff of the files in OLD-TAR and NEW-TAR. Used for checking
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
27 the contents of Emacs tar files.
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
28 EOF
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
29 exit 1;
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
30 fi
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
31
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
32 old_tar=$1
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
33 new_tar=$2
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
34
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
35 old_tmp=/tmp/old.$$
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
36 new_tmp=/tmp/new.$$
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
37 trap "rm -f $old_tmp $new_tmp; exit 1" 1 2 15
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
38
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
39 tar tzf $old_tar | sed -e 's,^[^/]*,,' | sort > $old_tmp
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
40 tar tzf $new_tar | sed -e 's,^[^/]*,,' | sort > $new_tmp
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
41 diff -u $old_tmp $new_tmp
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
42 rm -f $new_tmp $old_tmp
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
43
c296bfdefcc3 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
44
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 39058
diff changeset
45 # arch-tag: ef2c96e2-ea67-4668-925c-d9a6f3d205cf