Mercurial > emacs
view admin/revdiff @ 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.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Wed, 24 May 2006 07:54:46 +0000 |
parents | a8b22f12b3dc |
children | b2e5081b9320 72dea2ff0142 |
line wrap: on
line source
#! /usr/bin/perl # Copyright (C) 2001, 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. 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