Mercurial > emacs
view admin/revdiff @ 69049:28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
to use `int'.
(NO_FRINGE_BITMAP, UNDEF_FRINGE_BITMAP, MAX_STANDARD_FRINGE_BITMAPS):
Define explicitly.
(Qtruncation, Qcontinuation, Qempty_line, Qtop_bottom)
(Qhollow_small): New variables.
(syms_of_fringe): Intern and staticpro them.
(question_mark_bits): Rename from unknown_bits.
(left_curly_arrow_bits): Rename from continuation_bits.
(right_curly_arrow_bits): Rename from continued_bits.
(left_triangle_bits): Rename from ov_bits.
(right_triangle_bits): Added.
(filled_rectangle_bits): Rename from filled_box_cursor_bits.
(hollow_rectangle_bits): Rename from hollow_box_cursor_bits.
(filled_square_bits): Added.
(vertical_bar_bits): Rename from bar_cursor_bits.
(horisontal_bar_bits): Rename from hbar_cursor_bits.
(empty_line_bits): Rename from zv_bits.
(standard_bitmaps): Update to use new names.
(draw_fringe_bitmap_1): Make static.
(get_logical_cursor_bitmap, get_logical_fringe_bitmap): New functions
to map from logical cursors and indicators to physical bitmaps.
(draw_fringe_bitmap): Resolve fringe cursor and overlay-arrow
bitmaps using symbol names instead of bitmap numbers.
(update_window_fringes): Use logical indicator symbol names
instead of bitmap numbers for logical. Add bitmap cache.
(LEFT_FRINGE, RIGHT_FRINGE): New helper macros.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Mon, 20 Feb 2006 22:14:22 +0000 |
parents | c53a9463c31a |
children | a8b22f12b3dc f9a65d7ebd29 |
line wrap: on
line source
#! /usr/bin/perl # Copyright (C) 2001 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. use File::Basename; if (@ARGV < 3) { print <<USAGE; revdiff FILE OLD NEW Get a diff of FILE between revisions OLD and NEW. Store the diff in a file named FILE-OLD-NEW.diff. If OLD is `-' use FILE's current revision for OLD. If OLD is `-<number>', use the Nth revision before the current one for OLD. If NEW is +<number> or -<number>, build diffs between revisions OLD and OLD +/- <number>. Examples: revdiff FILE - -1 get the latest change of FILE revdiff FILE -1 +1 also gets the latest change of FILE revdiff FILE 1.500 +2 get diffs 1.500-1.501 and 1.501-1.502. USAGE exit 1; } $file = shift @ARGV; $old = shift @ARGV; sub diffit { my ($old, $new) = @_; print "cvs diff -r$old -r$new $file >$file-$old-$new.diff\n"; system "cvs diff -r$old -r$new $file >$file-$old-$new.diff"; } sub current_revision ($) { my ($file) = @_; my $dir = dirname ($file); my $base = basename ($file); my $entries = "$dir/CVS/Entries"; die "Can't find $entries" unless -f $entries; open (IN, "<$entries") or die "Cannot open $entries"; my $rev; while ($line = <IN>) { if ($line =~ m,/$base/([^/]+),) { $rev = $1; break; } } die "Cannot determine current revision of $file" unless $rev; close (IN); return $rev; } if ($old eq "-") { $old = current_revision ($file); } elsif ($old =~ /^-(\d+)$/) { my $offset = $1; $old = current_revision ($file); die "Internal error" unless $old =~ /(.*)\.(\d+)$/; my $minor = $2 - $offset; $old = sprintf ("%d.%d", $1, $minor); } while (@ARGV) { my $new = shift @ARGV; if ($new =~ /^[+]\d+$/) { my $n = $new; for ($i = 0; $i < $n; ++$i) { unless ($old =~ /(.*)\.(\d+)$/) { die "Internal error"; } my $j = $2 + 1; $new = "$1.$j"; diffit ($old, $new); $old = $new; } } elsif ($new =~ /^[-]\d+$/) { my $n = - $new; for ($i = 0; $i < $n; ++$i) { unless ($old =~ /(.*)\.(\d+)$/) { die "Internal error"; } my $j = $2 - 1; $new = "$1.$j"; diffit ($new, $old); $old = $new; } } else { diffit ($old, $new); $old = $new; } } # Local Variables: # mode: cperl # End: # arch-tag: 2798b20d-c7f2-4c78-8378-7bb529c36a09