annotate lib-src/vcdiff @ 844:047d37eb70d7

[xemacs-hg @ 2002-05-16 13:30:23 by ben] ui fixes for things that were bothering me bytecode.c, editfns.c, lisp.h, lread.c: Fix save-restriction to use markers rather than pseudo-markers (integers representing the amount of text on either side of the region). That way, all inserts are handled correctly, not just those inside old restriction. Add buffer argument to save_restriction_save(). process.c: Clean up very dirty and kludgy code that outputs into a buffer -- use proper unwind protects, etc. font-lock.c: Do save-restriction/widen around the function -- otherwise, incorrect results will ensue when a buffer has been narrowed before a call to e.g. `buffer-syntactic-context' -- something that happens quite often. fileio.c: Look for a handler for make-temp-name. window.c, winslots.h: Try to solve this annoying problem: have two frames displaying the buffer, in different places; in one, temporarily switch away to another buffer and then back -- and you've lost your position; it's reset to the other one in the other frame. My current solution involves window-level caches of buffers and points (also a cache for window-start); when set-window-buffer is called, it looks to see if the buffer was previously visited in the window, and if so, uses the most recent point at that time. (It's a marker, so it handles changes.) #### Note: It could be argued that doing it on the frame level would be better -- e.g. if you visit a buffer temporarily through a grep, and then go back to that buffer, you presumably want the grep's position rather than some previous position provided everything was in the same frame, even though the grep was in another window in the frame. However, doing it on the frame level fails when you have two windows on the same frame. Perhaps we keep both a window and a frame cache, and use the frame cache if there are no other windows on the frame showing the buffer, else the window's cache? This is probably something to be configurable using a specifier. Suggestions please please please? window.c: Clean up a bit code that deals with the annoyance of window-point vs. point. dialog.el: Function to ask a multiple-choice question, automatically choosing a dialog box or minibuffer representation as necessary. Generalized version of yes-or-no-p, y-or-n-p. files.el: Use get-user-response to ask "yes/no/diff" question when recovering. "diff" means that a diff is displayed between the current file and the autosave. (Converts/deconverts escape-quoted as necessary. No more complaints from you, Mr. Turnbull!) One known problem: when a dialog is used, it's modal, so you can't scroll the diff. Will fix soon. lisp-mode.el: If we're filling a string, don't treat semicolon as a comment, which would give very unfriendly results. Uses `buffer-syntactic-context'. simple.el: all changes back to the beginning. (Useful if you've saved the file in the middle of the changes.) simple.el: Add option kill-word-into-kill-ring, which controls whether words deleted with kill-word, backward-kill-word, etc. are "cut" into the kill ring, or "cleared" into nothingness. (My preference is the latter, by far. I'd almost go so far as suggesting we make it the default, as you can always select a word and then cut it if you want it cut.) menubar-items.el: Add option corresponding to kill-word-into-kill-ring.
author ben
date Thu, 16 May 2002 13:30:58 +0000
parents 376386a54a3c
children 061f4f90f874 06dd936cde16
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 #!/bin/sh
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 # Enhanced sccs diff utility for use with vc mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 # This version is more compatible with rcsdiff(1).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 # !Id: vcdiff,v 1.4 1993/12/03 09:29:18 eggert Exp !
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 # Modified by: vladimir@Eng.Sun.COM on 95-06-07
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 # * Made sure that file arguments are specifed as s.<filename>.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 # * Switched the assignments to $f inside the 3rd and 4th case statements of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 # the first for-loop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 # * Removed the incorrect initialization of sid1 before the first for-loop.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 DIFF="diff"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 PATH=$PATH:/usr/ccs/bin:/usr/sccs # common SCCS hangouts
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 echo=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 sid1= sid2=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 for f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24 do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 case $f in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 -*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 case $f in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 --brief)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 DIFF=cmp;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 -q)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 echo=:;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 -r?*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 case $sid1 in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 -r*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 sid2=$f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 case $sid2 in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 ?*) echo "$usage" >&2; exit 2 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 sid1=$f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 options="$options $f"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 shift
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 break
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 done
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 case $# in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 echo "$usage" >&2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 exit 2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 rev1= rev2= status=0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 trap 'status=2; exit' 1 2 13 15
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 for f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 s=2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 # For files under SCCS control, fixup the file name to be the s. filename
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 if [ -d SCCS ]; then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 if [ $f = `echo $f | sed -e 's|SCCS/s.||'` ]; then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 f="SCCS/s.$f"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 case $f in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 s.* | */s.*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 rev1=/tmp/geta$$
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 get -s -p -k $sid1 "$f" > $rev1 &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 case $sid2 in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 '')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 workfile=`expr " /$f" : '.*/s.\(.*\)'`
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 rev2=/tmp/getb$$
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 get -s -p -k $sid2 "$f" > $rev2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 workfile=$rev2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 $echo $DIFF $options $sid1 $sid2 $workfile >&2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 $DIFF $options $rev1 $workfile
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 s=$?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 echo "$0: $f is not an SCCS file" >&2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 if test $status -lt $s
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 then status=$s
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 done