Mercurial > emacs
annotate lib-src/vcdiff @ 96566:dec3815c40d7
(xfont_open): Cancel the previous about font->vertical_centering.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Wed, 09 Jul 2008 02:02:14 +0000 |
parents | 3a4bc081639c |
children | a9f7e446141d |
rev | line source |
---|---|
12507
da322c027bf0
Replace `#!/bin/sh' with `#! /bin/sh', for benefit of systems
Paul Eggert <eggert@twinsun.com>
parents:
5211
diff
changeset
|
1 #! /bin/sh |
928 | 2 # |
3 # Enhanced sccs diff utility for use with vc mode. | |
4 # This version is more compatible with rcsdiff(1). | |
5 # | |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
6 # Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005, |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
7 # 2006, 2007, 2008 Free Software Foundation, Inc. |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
8 |
36226 | 9 # This file is part of GNU Emacs. |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
10 |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
11 # GNU Emacs is free software: you can redistribute it and/or modify |
36226 | 12 # it under the terms of the GNU General Public License as published by |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
13 # the Free Software Foundation, either version 3 of the License, or |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
14 # (at your option) any later version. |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
15 |
36226 | 16 # GNU Emacs is distributed in the hope that it will be useful, |
17 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 # GNU General Public License for more details. | |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
20 |
36226 | 21 # You should have received a copy of the GNU General Public License |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
22 # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94190
diff
changeset
|
23 |
928 | 24 |
25 DIFF="diff" | |
5211 | 26 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..." |
928 | 27 |
94190
fad57210c7d2
* lisp/vc-sccs.el (vc-sccs-do-command): New fun. Use the "sccs" command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80512
diff
changeset
|
28 # Now that we use `sccs get' rather than just `get', we don't need this. |
fad57210c7d2
* lisp/vc-sccs.el (vc-sccs-do-command): New fun. Use the "sccs" command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80512
diff
changeset
|
29 # PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts |
4653
8e72792f2d18
Append /usr/ccs/bin and /usr/sccs to PATH.
Paul Eggert <eggert@twinsun.com>
parents:
3933
diff
changeset
|
30 |
69559
130314bad206
Use "echo" as a default for $echo, otherwise we'll execute $DIFF
André Spiegel <spiegel@gnu.org>
parents:
68647
diff
changeset
|
31 echo="echo" |
16804
0ba6599135d6
(PATH): Add /usr/xpg4/bin,
Paul Eggert <eggert@twinsun.com>
parents:
12507
diff
changeset
|
32 sid1= sid2= |
928 | 33 |
34 for f | |
35 do | |
36 case $f in | |
37 -*) | |
38 case $f in | |
5211 | 39 --brief) |
40 DIFF=cmp;; | |
3933 | 41 -q) |
42 echo=:;; | |
928 | 43 -r?*) |
44 case $sid1 in | |
16804
0ba6599135d6
(PATH): Add /usr/xpg4/bin,
Paul Eggert <eggert@twinsun.com>
parents:
12507
diff
changeset
|
45 '') |
928 | 46 sid1=$f |
47 ;; | |
48 *) | |
49 case $sid2 in | |
50 ?*) echo "$usage" >&2; exit 2 ;; | |
51 esac | |
52 sid2=$f | |
53 ;; | |
54 esac | |
55 ;; | |
56 *) | |
57 options="$options $f" | |
58 ;; | |
59 esac | |
60 shift | |
61 ;; | |
62 *) | |
63 break | |
64 ;; | |
65 esac | |
66 done | |
67 | |
68 case $# in | |
69 0) | |
70 echo "$usage" >&2 | |
71 exit 2 | |
72 esac | |
73 | |
74 | |
75 rev1= rev2= status=0 | |
76 trap 'status=2; exit' 1 2 13 15 | |
77 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0 | |
78 | |
79 for f | |
80 do | |
81 s=2 | |
82 | |
83 case $f in | |
84 s.* | */s.*) | |
85 if | |
80512
444a87e05509
2008-04-18 Steve Grubb <sgrubb@redhat.com> (tiny change)
Romain Francoise <romain@orebokech.com>
parents:
79748
diff
changeset
|
86 rev1=`mktemp /tmp/geta.XXXXXXXX` |
94190
fad57210c7d2
* lisp/vc-sccs.el (vc-sccs-do-command): New fun. Use the "sccs" command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80512
diff
changeset
|
87 sccs get -s -p -k $sid1 "$f" > $rev1 && |
928 | 88 case $sid2 in |
89 '') | |
90 workfile=`expr " /$f" : '.*/s.\(.*\)'` | |
91 ;; | |
92 *) | |
80512
444a87e05509
2008-04-18 Steve Grubb <sgrubb@redhat.com> (tiny change)
Romain Francoise <romain@orebokech.com>
parents:
79748
diff
changeset
|
93 rev2=`mktemp /tmp/getb.XXXXXXXX` |
94190
fad57210c7d2
* lisp/vc-sccs.el (vc-sccs-do-command): New fun. Use the "sccs" command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80512
diff
changeset
|
94 sccs get -s -p -k $sid2 "$f" > $rev2 |
928 | 95 workfile=$rev2 |
96 esac | |
97 then | |
69559
130314bad206
Use "echo" as a default for $echo, otherwise we'll execute $DIFF
André Spiegel <spiegel@gnu.org>
parents:
68647
diff
changeset
|
98 $echo $DIFF $options $rev1 $workfile >&2 |
928 | 99 $DIFF $options $rev1 $workfile |
100 s=$? | |
101 fi | |
102 ;; | |
103 *) | |
104 echo "$0: $f is not an SCCS file" >&2 | |
105 esac | |
106 | |
107 if test $status -lt $s | |
108 then status=$s | |
109 fi | |
110 done | |
52401 | 111 |
112 # arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a |