view lib-src/vcdiff @ 70866:7d0efe895341

(org-open-at-point): Use renamed variable `org-confirm-shell-link-function'. (org-confirm-shell-link-function): Renamed from `org-confirm-shell-links'. (org-export-directory): New function. (org-export-as-ascii, org-export-as-html, org-export-as-xoxo) (org-export-icalendar): Use `org-export-directory'. (org-indent-item): Keep cursor position. (org-link-file-path-type): New option. (org-export-as-html): Fixed bug with plain lists starting in column 0. (org-export-as-html): Removed deadline formatting, this happens now already in `org-html-handle-time-stamps'. (org-export-html-style): Deadline class removed. (org-insert-labeled-timestamps-at-point): New option. (org-cycle, org-occur, org-scan-tags): Use `org-overview' instead of `hide-sublevels 1', in case the first headline is not level 1. (org-overview, org-content): New fuction. (org-cycle-global-status, org-cycle-subtree-status): Make these variables buffer-local. (org-global-cycle): New command. (org-shifttab): Use `org-global-cycle'. (org-insert-heading, org-insert-item): Go to end of new headline/item after creating it. (org-export-visible): Renames from `org-export-copy-visible'. Now creates a temporary org-file and applies an exporting command to it. (org-table-eval-formula): Support for lisp forms. (org-agenda-todo-ignore-scheduled): New option. (org-agenda-get-todos): Use new option `org-agenda-todo-ignore-scheduled'. (org-export-html-inline-images): New value `maybe'. (org-export-as-html): Inlining of images dependent on link description. (org-archive-subtree): Check for end-of-buffer before trying `kill-line'. (org-agenda-follow-mode): New option. (org-export-with-tags, org-export-with-timestamps): New options. (org-html-handle-time-stamps): New function. (org-keyword-time-regexp): New variable. (org-agenda-get-todos): Use `org-agenda-todo-list-sublevels'. (org-agenda-todo-list-sublevels): New option. (org-html-level-start): When TITLE is nil, just close all levels. (org-parse-key-lines, org-parse-export-options): Functions removed, replaced by `org-infile-export-plist'. (org-combine-plists, org-infile-export-plist) (org-default-export-plist): New functions. (org-export-html-preamble, org-export-html-postamble) (org-export-html-auto-preamble, org-export-html-auto-postamble): New variables. (org-export-publishing-directory): New option. (org-export-as-html, org-export-as-ascii): Use the new property lists for settings. (org-export-copy-visible, org-export-as-xoxo): Respect `org-export-publishing-directory'. (org-link-search, org-store-link, org-file-apps): Support for links to BibTeX database entries.. (org-get-current-options, org-set-regexps-and-options): Implement logging as a startup option. (org-store-link): Make sure context string is never empty (org-insert-link): Use relative path when possible. (org-at-item-checklet-p): New function. (org-shifttab, org-shiftmetaleft, org-shiftmetaright) (org-shiftmetaup, org-shiftmetadown, org-metaleft) (org-metaright, org-metaup, org-metadown, org-shiftup) (org-shiftdown, org-shiftright, org-shiftleft) (org-ctrl-c-ctrl-c, org-cycle, org-return, org-meta-return): Dispatch using `call-interactively'. (org-call-with-arg): New defsubst. (org-tag-alist, org-use-fast-tag-selection): New options. (org-complete): Use `org-tag-alist'. (org-fast-tag-insert, org-fast-tag-selection): New functions. (org-next-item, org-previous-item): New commands. (org-beginning-of-item, org-end-of-item): Added (interactive) to make command. (org-shiftup, org-shiftdown): Accommodate the item-navigation commands.

#! /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