Mercurial > emacs
view lib-src/vcdiff @ 103406:2a3d145eef1e
Remove the term "on-line" (meaning "Info") throughout, since
in this day and age the common meaning is "on the web".
(copying): Use @copyright in all cases.
(Basic keys): Remove reference to deleted manual node "Text Characters".
(File-name conventions): Use GNU as an example rather than SERVICE.
default.el lives in site-lisp. Update Info directory location.
(Real meaning of copyleft): GPL actions have been brought, but all
settled out of court.
(Guidelines for newsgroup postings): Shorten section title.
Simplify comp.emacs description.
(Newsgroup archives): Change Google URL. Describe Gmane.
(Unsubscribing from Emacs lists): Remove discussion of "distribution
points". Mention List-Unsubscribe header.
(Contacting the FSF): Update email and URLs.
(Basic editing): Mention F1 for help.
(Installing Texinfo documentation): Refer to Texinfo website rather
than ftp server.
(Printing a Texinfo file): Mention texi2pdf.
(Informational files for Emacs): Don't describe FTP or SERVICE, they
are just stubs nowadays.
(Latest version of Emacs): Explain version numbers.
(Spell-checkers, Checking TeX and *roff documents): Remove sections.
(Turning on syntax highlighting): No need to mention hilit19 any more.
(Finding Emacs on the Internet): Refer to URLs rather than DISTRIB, FTP.
(Modes for various languages): Remove section.
(Major packages and programs): Remove most version and maintainer
information - it's hard to keep up-to-date, and adds nothing.
Similarly with direct links to mailing lists.
(Spell-checkers): Rename node from Ispell. Mention Aspell and Hunspell.
(Mailcrypt): Remove section - mailcrypt has not been updated in mnay
years, and Emacs comes with tools for this now.
(Patch): Remove section - this is a standard tool.
(Using function keys under X): Remove section.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sat, 13 Jun 2009 02:21:29 +0000 |
parents | 1060b95add8a |
children | 1d1d5d9bd884 |
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, 2008, 2009 Free Software Foundation, Inc. # Author: Paul Eggert # (according to authors.el) # 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. DIFF="diff" usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..." # Now that we use `sccs get' rather than just `get', we don't need this. # 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=`mktemp /tmp/geta.XXXXXXXX` sccs get -s -p -k $sid1 "$f" > $rev1 && case $sid2 in '') workfile=`expr " /$f" : '.*/s.\(.*\)'` ;; *) rev2=`mktemp /tmp/getb.XXXXXXXX` sccs 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