Mercurial > emacs
view admin/revdiff @ 81787:85b9e979aded
* org.el (org-agenda-day-view, org-agenda-week-view): Remember
span as default.
(org-columns-edit-value): Renamed from `org-column-edit'.
(org-columns-display-here-title): Renamed from
`org-overlay-columns-title'.
(org-columns-remove-overlays): ` Renamed from
org-remove-column-overlays'.
(org-columns-get-autowidth-alist): ` Renamed from
org-get-columns-autowidth-alist'.
(org-columns-display-here): Renamed from `org-overlay-columns'.
(org-columns-new-overlay): Renamed from `org-new-column-overlay'.
(org-columns-quit): Renamed from `org-column-quit'.
(org-columns-show-value): Renamed from `org-column-show-value'.
(org-columns-content, org-columns-widen)
(org-columns-next-allowed-value)
(org-columns-edit-allowed, org-columns-store-format)
(org-columns-uncompile-format, org-columns-redo)
(org-columns-edit-attributes, org-delete-property)
(org-set-property, org-columns-update)
(org-columns-compute, org-columns-eval)
(org-columns-not-in-agenda, org-columns-compute-all)
(org-property-next-allowed-value)
(org-columns-compile-format)
(org-fill-paragraph-experimental)
(org-string-to-number, org-property-action)
(org-columns-move-left, org-columns-new )
(org-column-number-to-string)
(org-property-previous-allowed-value)
(org-at-property-p, org-columns-delete)
(org-columns-previous-allowed-value)
(org-columns-move-right, org-columns-narrow)
(org-property-get-allowed-values)
(org-verify-version, org-column-string-to-number)
(org-delete-property-globally): New functions.
(org-columns-current-fmt): Renamed from `org-current-columns-fmt'.
(org-columns-overlays): Renamed from `org-column-overlays'.
(org-columns-map): Renamed from `org-column-map'.
(org-columns-current-maxwidths): Renamed from
`org-current-columns-maxwidths'.
(org-columns-begin-marker, org-columns-current-fmt-compiled)
(org-previous-header-line-format)
(org-columns-inhibit-recalculation)
(org-columns-top-level-marker): New variables.
(org-columns-default-format): Renamed from
`org-default-columns-format'.
(org-property-re): New constant.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Tue, 10 Jul 2007 07:23:03 +0000 |
parents | 3d45362f1d38 |
children | 450fa81c5930 95d0cdf160ea |
line wrap: on
line source
#! /usr/bin/perl # Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 # 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