Mercurial > emacs
view lib-src/vcdiff @ 63359:add99bfc904a
(org-CUA-compatible): New option.
(org-disputed-keys): New variable.
(org-key): New function.
(orgtbl-make-binding): Add docstring to the created function.
(org-mode): Set paragraph start/separate regexps.
(orgtbl-mode): Don't start `orgtbl-mode' in `org-mode' buffers.
(org-archive-location, org-archive-mark-done)
(org-archive-stamp-time): New options.
(org-archive-subtree): New command.
(org-fill-paragraph): New function.
(org-mode): Set `fill-paragraph-function' to `org-fill-paragraph'.
(org-fake-empty-table-line): Function removed.
(org-format-org-table-html): Do not create empty table lines at
separator lines. Improved table header treatment.
(org-link-format): New option.
(org-make-link): New function.
(org-insert-link, org-store-link): Use org-make-link.
(org-open-file): Quote file name for shell command, to allow
spaces in file names.
(org-link-regexp): Fixed bug with mailto link.
(org-link-maybe-angles-regexp, org-protected-link-regexp): New
constant.
(org-export-as-html): Deal with the optional angles around a link.
Better treatment of file: links.
(org-open-at-point): Replace @{ and @} with < and >.
(org-run-mode-hooks): Function removed.
(org-agenda-mode): No longer use `org-run-mode-hooks'.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Mon, 13 Jun 2005 06:40:57 +0000 |
parents | 746c40973d25 |
children | 23a17af379b1 eb7e8d483840 |
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, 2004 # 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., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, 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= 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 $sid1 $sid2 $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