view lib-src/vcdiff @ 66703:6cfb275aa300

Use split-string OMIT-NULLS argument. (rcirc-print): Force redisplay before running hooks. Do long buffer truncation after making new text read-only. Deal with nil text when decoding strings. If TARGET is nil, use either the currently selected buffer, if it is an rcirc buffer and of the same process or the process buffer. (rcirc-mode): Remove header-line. Recompute short buffer names. Initialize rcirc-buffer-alist here instead of rcirc-get-buffer-create. (rcirc-short-buffer-name): Add variable. (rcirc-kill-buffer-hook): Recompute short buffer names. Remove nick from private channel. (rcirc-send-input): Send command text to current-buffer. Don't clear overlay arrow here. (rcirc-short-buffer-name): Return a short buffer name. (rcirc-update-short-buffer-names, rcirc-abbreviate) (rcirc-rebuild-tree, rcirc-make-trees): Add functions to generate buffer-name abbreviations. (rcirc-kill-buffer-hook-1): Split to make debugging easier. Do not touch nick-table when killing a parted channel. (rcirc-window-configuration-change): Rename from rcirc-update-activity. Clear arrow from current buffer if it is now hidden. (rcirc-current-buffer): Add variable. (rcirc-my-nick, rcirc-other-nick, rcirc-server) (rcirc-nick-in-message, rcirc-prompt, rcirc-mode-line-nick): Remove -face from names. (rcirc-update-activity-string): Print "DND" when globally ignoring activity. (rcirc-ignore-buffer-activity-flag): Rename from rcirc-ignore-channel-activity. (rcirc-ignore-all-activity-flag): Doc fix. (rcirc-channels): Remove variable. (rcirc-kill-buffer-hook): (rcirc-get-buffer-create): Add nick to private channel. (rcirc-multiline-edit-submit): Remove tabs. (rcirc-put-nick-channel, rcirc-channel-nicks): Look up nicks case folded. (rcirc-remove-nick-channel): Bug fix. (rcirc-toggle-ignore-buffer-activity): Rename from rcirc-toggle-ignore-channel-activity. (rcirc-record-activity): Add buffers to the front of the list. (rcirc-update-activity): Remove killed buffers from list. (rcirc-process-server-response-1): Remove last argument if it is null before calling handler. (rcirc): Add "rcirc" defcustom prefix. (rcirc-prompt): Simplify default prompt. Use custom-initialize-default. (rcirc-private-chats): Remove variable. (rcirc-prompt): Change initialization. (rcirc-version): Remove function. (rcirc-id-string): Add constant. (rcirc-last-buffer): Remove variable. (rcirc-buffer-alist): Add variable. (rcirc-connect): Update variable setup. (rcirc-sentinel, rcirc-update-prompt): Use `rcirc-buffer-alist'. (rcirc-trap-errors-flag): Rename from `rcirc-trap-errors' change default. (rcirc-handler-generic): Trigger activity. (rcirc-send-message): Create the buffor of the target. (rcirc-generate-new-buffer-name): Rename from `rcirc-get-buffer-name'. (rcirc-get-buffer): Just return nil if there is no matching buffer. (rcirc-multiline-edit-cancel): Remove function. (rcirc-set-last-buffer): Remove function. (rcirc-get-any-buffer): Add function. (rcirc-join-channels): Don't print /join text. (rcirc-toggle-ignore-channel-activity): Add and update echo area messages. (rcirc-cmd-ctcp): Use rcirc-send-string to send request. (rcirc-handler-NOTICE): Recognize CTCP responses. (rcirc-handler-332, rcirc-handler-332): Use a temp buffer for constructing TOPIC string for buffers we are not JOINed. (rcirc-handler-CTCP-response): Add handler. (rcirc-multiline-edit-submit): Restore the window-configuration before adjusting point. (rcirc): Add customization group. (rcirc-server, rcirc-port, rcirc-nick, rcirc-user-name) (rcirc-user-full-name, rcirc-startup-channels-alist) (rcirc-fill-flag, rcirc-fill-column, rcirc-fill-prefix) (rcirc-ignore-all-activity-flag, rcirc-time-format) (rcirc-input-ring-size, rcirc-read-only-flag) (rcirc-buffer-maximum-lines, rcirc-authinfo-file-name) (rcirc-auto-authenticate-flag, rcirc-prompt, rcirc-print-hooks): Change defvar to defcustom. (rcirc-update-prompt): Add optional ALL arg, which will update prompts in all rcirc buffers. Regexp quote replacement text. (rcirc-fill-column): Accept 'frame-width as a value. (rcirc-set-changed): Add function. (rcirc-next-active-buffer): Write more meaningful messages. (rcirc-faces): Add customization group. (rcirc-my-nick-face, rcirc-other-nick-face, rcirc-server-face) (rcirc-nick-in-message-face, rcirc-prompt-face) (rcirc-mode-line-nick-face): Move into rcirc-faces group. (with-rcirc-process-buffer): Move before first usage. (rcirc-debug-buffer): Rename from `rcirc-log-buffer'. (rcirc-debug-flag): Rename from `rcirc-log-p'. (rcirc-debug): Rename from `rcirc-log'. (rcirc-format-response-string): Do not print '-' chars for a NOTICE with no sender. Simplify output of server responses. (rcirc-browse-url-map, rcirc-browse-url-at-point) (rcirc-browse-url-at-mouse, rcirc-mangle-text): Make urls mouse and RET clickable.
author Eli Zaretskii <eliz@gnu.org>
date Fri, 04 Nov 2005 15:05:11 +0000 (2005-11-04)
parents 6358e3c6075c
children 3661e9b3c48f 532e0a9335a9 2d92f5c9d6ae
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 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=
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