Mercurial > emacs
view lib-src/vcdiff @ 73269:aeb79612dc36
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 145-148)
- Merge from emacs--devo--0
- Update from CVS
2006-10-04 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-sum.el (gnus-summary-make-menu-bar): Clarify
gnus-summary-limit-to-articles.
2006-10-04 Romain Francoise <romain@orebokech.com>
* lisp/gnus/gnus-util.el (gnus-alist-to-hashtable, gnus-hashtable-to-alist):
Moved here (and renamed) from gnus-registry.el.
* lisp/gnus/gnus-registry.el: Require gnus-util.
Use `gnus-alist-to-hashtable' and `gnus-hashtable-to-alist'.
2006-10-04 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/pop3.el (pop3-authentication-scheme): Clarify doc.
(pop3-movemail): Warn about pop3-leave-mail-on-server.
2006-10-04 Dave Love <fx@gnu.org>
* lisp/gnus/pop3.el (pop3-authentication-scheme): Add custom version.
2006-10-04 Jesper Harder <harder@ifa.au.dk>
* lisp/gnus/pop3.el (pop3-leave-mail-on-server): Don't quote nil in
doc string. Improve doc string.
2006-10-03 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-util.el (gnus-with-local-quit): New macro.
* lisp/gnus/gnus-demon.el (gnus-demon): Replace with-local-quit with it.
2006-10-06 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Image Enhancements): Update for Emacs 22.
* man/gnus-faq.texi ([1.3]): Update.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-466
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 07 Oct 2006 01:51:54 +0000 |
parents | 130314bad206 |
children | 3d45362f1d38 b901f4f12f33 e3bacb89536a |
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 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