Mercurial > emacs
annotate admin/revdiff @ 63480:53e7abe8917f
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-425
Remove "-face" suffix from gnus faces
2005-06-16 Miles Bader <miles@gnu.org>
* lisp/gnus/spam.el (spam): Remove "-face" suffix from face name.
(spam-face): New backward-compatibility alias for renamed face.
(spam-face, spam-initialize): Use renamed spam face.
* lisp/gnus/message.el (message-header-to, message-header-cc)
(message-header-subject, message-header-newsgroups)
(message-header-other, message-header-name)
(message-header-xheader, message-separator, message-cited-text)
(message-mml): Remove "-face" suffix from face names.
(message-header-to-face, message-header-cc-face)
(message-header-subject-face, message-header-newsgroups-face)
(message-header-other-face, message-header-name-face)
(message-header-xheader-face, message-separator-face)
(message-cited-text-face, message-mml-face):
New backward-compatibility aliases for renamed faces.
(message-font-lock-keywords): Use renamed message faces.
* lisp/gnus/sieve-mode.el (sieve-control-commands, sieve-action-commands)
(sieve-test-commands, sieve-tagged-arguments):
Remove "-face" suffix from face names.
(sieve-control-commands-face, sieve-action-commands-face)
(sieve-test-commands-face, sieve-tagged-arguments-face):
New backward-compatibility aliases for renamed faces.
(sieve-control-commands-face, sieve-action-commands-face)
(sieve-test-commands-face, sieve-tagged-arguments-face):
Use renamed sieve faces.
* lisp/gnus/gnus.el (gnus-group-news-1, gnus-group-news-1-empty)
(gnus-group-news-2, gnus-group-news-2-empty, gnus-group-news-3)
(gnus-group-news-3-empty, gnus-group-news-4)
(gnus-group-news-4-empty, gnus-group-news-5)
(gnus-group-news-5-empty, gnus-group-news-6)
(gnus-group-news-6-empty, gnus-group-news-low)
(gnus-group-news-low-empty, gnus-group-mail-1)
(gnus-group-mail-1-empty, gnus-group-mail-2)
(gnus-group-mail-2-empty, gnus-group-mail-3)
(gnus-group-mail-3-empty, gnus-group-mail-low)
(gnus-group-mail-low-empty, gnus-summary-selected)
(gnus-summary-cancelled, gnus-summary-high-ticked)
(gnus-summary-low-ticked, gnus-summary-normal-ticked)
(gnus-summary-high-ancient, gnus-summary-low-ancient)
(gnus-summary-normal-ancient, gnus-summary-high-undownloaded)
(gnus-summary-low-undownloaded)
(gnus-summary-normal-undownloaded, gnus-summary-high-unread)
(gnus-summary-low-unread, gnus-summary-normal-unread)
(gnus-summary-high-read, gnus-summary-low-read)
(gnus-summary-normal-read, gnus-splash):
Remove "-face" suffix from face names.
(gnus-group-news-1-face, gnus-group-news-1-empty-face)
(gnus-group-news-2-face, gnus-group-news-2-empty-face)
(gnus-group-news-3-face, gnus-group-news-3-empty-face)
(gnus-group-news-4-face, gnus-group-news-4-empty-face)
(gnus-group-news-5-face, gnus-group-news-5-empty-face)
(gnus-group-news-6-face, gnus-group-news-6-empty-face)
(gnus-group-news-low-face, gnus-group-news-low-empty-face)
(gnus-group-mail-1-face, gnus-group-mail-1-empty-face)
(gnus-group-mail-2-face, gnus-group-mail-2-empty-face)
(gnus-group-mail-3-face, gnus-group-mail-3-empty-face)
(gnus-group-mail-low-face, gnus-group-mail-low-empty-face)
(gnus-summary-selected-face, gnus-summary-cancelled-face)
(gnus-summary-high-ticked-face, gnus-summary-low-ticked-face)
(gnus-summary-normal-ticked-face)
(gnus-summary-high-ancient-face, gnus-summary-low-ancient-face)
(gnus-summary-normal-ancient-face)
(gnus-summary-high-undownloaded-face)
(gnus-summary-low-undownloaded-face)
(gnus-summary-normal-undownloaded-face)
(gnus-summary-high-unread-face, gnus-summary-low-unread-face)
(gnus-summary-normal-unread-face, gnus-summary-high-read-face)
(gnus-summary-low-read-face, gnus-summary-normal-read-face)
(gnus-splash-face):
New backward-compatibility aliases for renamed faces.
(gnus-group-startup-message): Use renamed gnus faces.
* lisp/gnus/gnus-srvr.el (gnus-server-agent, gnus-server-opened)
(gnus-server-closed, gnus-server-denied, gnus-server-offline)
(gnus-server-agent): Remove "-face" suffix from face names.
(gnus-server-agent-face, gnus-server-opened-face)
(gnus-server-closed-face, gnus-server-denied-face)
(gnus-server-offline-face):
New backward-compatibility aliases for renamed faces.
(gnus-server-agent-face, gnus-server-opened-face)
(gnus-server-closed-face, gnus-server-denied-face)
(gnus-server-offline-face): Use renamed gnus faces.
* lisp/gnus/gnus-picon.el (gnus-picon-xbm, gnus-picon):
Remove "-face" suffix from face names.
(gnus-picon-xbm-face, gnus-picon-face):
New backward-compatibility aliases for renamed faces.
* lisp/gnus/gnus-cite.el (gnus-cite-attribution, gnus-cite-1, gnus-cite-2)
(gnus-cite-3, gnus-cite-4, gnus-cite-5, gnus-cite-6)
(gnus-cite-7, gnus-cite-8, gnus-cite-9, gnus-cite-10)
(gnus-cite-11): Remove "-face" suffix from face names.
(gnus-cite-attribution-face, gnus-cite-face-1, gnus-cite-face-2)
(gnus-cite-face-3, gnus-cite-face-4, gnus-cite-face-5)
(gnus-cite-face-6, gnus-cite-face-7, gnus-cite-face-8)
(gnus-cite-face-9, gnus-cite-face-10, gnus-cite-face-11):
New backward-compatibility aliases for renamed faces.
(gnus-cite-attribution-face, gnus-cite-face-list)
(gnus-article-boring-faces): Use renamed gnus faces.
* lisp/gnus/gnus-art.el (gnus-signature, gnus-header-from)
(gnus-header-subject, gnus-header-newsgroups, gnus-header-name)
(gnus-header-content): Remove "-face" suffix from face names.
(gnus-signature-face, gnus-header-from-face)
(gnus-header-subject-face, gnus-header-newsgroups-face)
(gnus-header-name-face, gnus-header-content-face):
New backward-compatibility aliases for renamed faces.
(gnus-signature-face, gnus-header-face-alist): Use renamed gnus faces.
* lisp/gnus/gnus-sum.el (gnus-summary-selected-face)
(gnus-summary-highlight): Use renamed gnus faces.
* lisp/gnus/gnus-group.el (gnus-group-highlight): Likewise.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 16 Jun 2005 03:48:20 +0000 |
| parents | 695cf19ef79e |
| children | c53a9463c31a 375f2633d815 |
| rev | line source |
|---|---|
| 38850 | 1 #! /usr/bin/perl |
| 2 | |
| 3 # Copyright (C) 2001 Free Software Foundation, Inc. | |
| 4 # | |
| 5 # This file is part of GNU Emacs. | |
| 6 # | |
| 7 # GNU Emacs is free software; you can redistribute it and/or modify | |
| 8 # it under the terms of the GNU General Public License as published by | |
| 9 # the Free Software Foundation; either version 2, or (at your option) | |
| 10 # any later version. | |
| 11 # | |
| 12 # GNU Emacs is distributed in the hope that it will be useful, | |
| 13 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 # GNU General Public License for more details. | |
| 16 # | |
| 17 # You should have received a copy of the GNU General Public License | |
| 18 # along with GNU Emacs; see the file COPYING. If not, write to the | |
| 19 # Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 # Boston, MA 02111-1307, USA. | |
| 21 | |
| 22 use File::Basename; | |
| 23 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
39132
diff
changeset
|
24 if (@ARGV < 3) |
| 38850 | 25 { |
| 26 print <<USAGE; | |
| 27 revdiff FILE OLD NEW | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
39132
diff
changeset
|
28 |
| 38850 | 29 Get a diff of FILE between revisions OLD and NEW. Store the |
| 39132 | 30 diff in a file named FILE-OLD-NEW.diff. |
| 31 | |
| 32 If OLD is `-' use FILE's current revision for OLD. If OLD is | |
| 33 `-<number>', use the Nth revision before the current one for OLD. | |
| 34 | |
| 35 If NEW is +<number> or -<number>, build diffs between revisions OLD | |
| 36 and OLD +/- <number>. | |
| 38850 | 37 |
| 38 Examples: | |
| 39 | |
| 40 revdiff FILE - -1 get the latest change of FILE | |
| 39132 | 41 revdiff FILE -1 +1 also gets the latest change of FILE |
| 38850 | 42 revdiff FILE 1.500 +2 get diffs 1.500-1.501 and 1.501-1.502. |
| 43 | |
| 44 USAGE | |
| 45 exit 1; | |
| 46 } | |
| 47 | |
| 48 $file = shift @ARGV; | |
| 49 $old = shift @ARGV; | |
| 50 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
39132
diff
changeset
|
51 sub diffit |
| 38850 | 52 { |
| 53 my ($old, $new) = @_; | |
| 54 print "cvs diff -r$old -r$new $file >$file-$old-$new.diff\n"; | |
| 55 system "cvs diff -r$old -r$new $file >$file-$old-$new.diff"; | |
| 56 } | |
| 57 | |
| 58 sub current_revision ($) | |
| 59 { | |
| 60 my ($file) = @_; | |
| 61 my $dir = dirname ($file); | |
| 62 my $base = basename ($file); | |
| 63 my $entries = "$dir/CVS/Entries"; | |
| 64 die "Can't find $entries" unless -f $entries; | |
| 65 open (IN, "<$entries") or die "Cannot open $entries"; | |
| 66 my $rev; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
39132
diff
changeset
|
67 while ($line = <IN>) |
| 38850 | 68 { |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
39132
diff
changeset
|
69 if ($line =~ m,/$base/([^/]+),) |
| 38850 | 70 { |
| 71 $rev = $1; | |
| 72 break; | |
| 73 } | |
| 74 } | |
| 75 die "Cannot determine current revision of $file" unless $rev; | |
| 76 close (IN); | |
| 77 return $rev; | |
| 78 } | |
| 79 | |
| 80 if ($old eq "-") | |
| 39132 | 81 { |
| 82 $old = current_revision ($file); | |
| 83 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
39132
diff
changeset
|
84 elsif ($old =~ /^-(\d+)$/) |
| 39132 | 85 { |
| 86 my $offset = $1; | |
| 87 $old = current_revision ($file); | |
| 88 die "Internal error" unless $old =~ /(.*)\.(\d+)$/; | |
| 89 my $minor = $2 - $offset; | |
| 90 $old = sprintf ("%d.%d", $1, $minor); | |
| 91 } | |
| 38850 | 92 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
39132
diff
changeset
|
93 while (@ARGV) |
| 38850 | 94 { |
| 95 my $new = shift @ARGV; | |
| 96 if ($new =~ /^[+]\d+$/) | |
| 97 { | |
| 98 my $n = $new; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
39132
diff
changeset
|
99 for ($i = 0; $i < $n; ++$i) |
| 38850 | 100 { |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
39132
diff
changeset
|
101 unless ($old =~ /(.*)\.(\d+)$/) |
| 38850 | 102 { |
| 103 die "Internal error"; | |
| 104 } | |
| 105 my $j = $2 + 1; | |
| 106 $new = "$1.$j"; | |
| 107 diffit ($old, $new); | |
| 108 $old = $new; | |
| 109 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
39132
diff
changeset
|
110 } |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
39132
diff
changeset
|
111 elsif ($new =~ /^[-]\d+$/) |
| 38850 | 112 { |
| 113 my $n = - $new; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
39132
diff
changeset
|
114 for ($i = 0; $i < $n; ++$i) |
| 38850 | 115 { |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
39132
diff
changeset
|
116 unless ($old =~ /(.*)\.(\d+)$/) |
| 38850 | 117 { |
| 118 die "Internal error"; | |
| 119 } | |
| 120 my $j = $2 - 1; | |
| 121 $new = "$1.$j"; | |
| 122 diffit ($new, $old); | |
| 123 $old = $new; | |
| 124 } | |
| 125 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
39132
diff
changeset
|
126 else |
| 38850 | 127 { |
| 128 diffit ($old, $new); | |
| 129 $old = $new; | |
| 130 } | |
| 131 } | |
| 132 | |
| 133 # Local Variables: | |
| 134 # mode: cperl | |
| 135 # End: | |
| 52401 | 136 |
| 137 # arch-tag: 2798b20d-c7f2-4c78-8378-7bb529c36a09 |
