Mercurial > emacs
view lib-src/vcdiff @ 81778:cd3e38bb3dc7
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 51-54)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 233-234)
- Merge from emacs--devo--0
- Update from CVS
2007-07-08 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/cus-start.el (file-coding-system-alist): Fix custom type.
2007-07-08 Chong Yidong <cyd@stupidchicken.com>
* lisp/longlines.el (longlines-wrap-region): Avoid marking buffer as
modified.
(longlines-auto-wrap, longlines-window-change-function): Remove
unnecessary calls to set-buffer-modified-p.
2007-07-03 Dan Nicolaescu <dann@ics.uci.edu>
* lisp/progmodes/gud.el (auto-mode-alist): Match more valid gdb init
file names.
2007-07-01 Richard Stallman <rms@gnu.org>
* lisp/files.el (find-file-visit-truename): Fix safe-local-variable value.
2007-07-04 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-sum.el (gnus-summary-catchup): Don't recognize cached
articles as unfetched articles.
2007-07-02 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-start.el (gnus-level-unsubscribed): Improve doc string.
2007-06-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-art.el (gnus-article-summary-command-nosave)
(gnus-article-read-summary-keys): Don't set the 3rd arg of
pop-to-buffer for XEmacs.
2007-07-02 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus-faq.texi ([3.2]): Fix locating of environment variables in the
Control Panel.
* man/gnus.texi (Misc Article): Add index entry for
gnus-single-article-buffer.
2007-06-27 Andreas Seltenreich <andreas@gate450.dyndns.org>
* man/gnus.texi (Starting Up): Fix typo.
2007-06-25 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Asynchronous Fetching): Fix typo.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-806
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 10 Jul 2007 02:02:35 +0000 |
| parents | 3d45362f1d38 |
| children | 1f2482de3237 b8d9a391daf3 95d0cdf160ea |
line wrap: on
line source
#! /bin/sh # # Enhanced sccs diff utility for use with vc mode. # This version is more compatible with rcsdiff(1). # # Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, # 2005, 2006, 2007 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 2, 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; see the file COPYING. If not, write to the # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. # DIFF="diff" usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..." PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts echo="echo" sid1= sid2= for f do case $f in -*) case $f in --brief) DIFF=cmp;; -q) echo=:;; -r?*) case $sid1 in '') sid1=$f ;; *) case $sid2 in ?*) echo "$usage" >&2; exit 2 ;; esac sid2=$f ;; esac ;; *) options="$options $f" ;; esac shift ;; *) break ;; esac done case $# in 0) echo "$usage" >&2 exit 2 esac rev1= rev2= status=0 trap 'status=2; exit' 1 2 13 15 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0 for f do s=2 case $f in s.* | */s.*) if rev1=/tmp/geta$$ get -s -p -k $sid1 "$f" > $rev1 && case $sid2 in '') workfile=`expr " /$f" : '.*/s.\(.*\)'` ;; *) rev2=/tmp/getb$$ get -s -p -k $sid2 "$f" > $rev2 workfile=$rev2 esac then $echo $DIFF $options $rev1 $workfile >&2 $DIFF $options $rev1 $workfile s=$? fi ;; *) echo "$0: $f is not an SCCS file" >&2 esac if test $status -lt $s then status=$s fi done # arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a
