Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge in new VC with filesets.

Browse source
This commit is contained in:
Eric S. Raymond 2007-10-10 13:17:53 +00:00
parent 84062ef1fe
commit d7b60083ce
3 changed files with 590 additions and 557 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure vendored
View file

@ -18532,11 +18532,13 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
#include <sys/types.h> /* for off_t */
#include <stdio.h>
int
main ()
{
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
int (*fp) (FILE *, off_t, int) = fseeko;
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
;
return 0;
}
@ -18576,11 +18578,13 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
#include <sys/types.h> /* for off_t */
#include <stdio.h>
int
main ()
{
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
int (*fp) (FILE *, off_t, int) = fseeko;
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
;
return 0;
}

51
lisp/ChangeLog
View file

@ -1,3 +1,54 @@
2007-10-10 Eric S. Raymond <esr@snark.thyrsus.com>
* vc.el (vc-next-action): Completely rewritten; this principal
entry point now operates on a current fileset selected either
explicitly via VC-Dired or implicitly by visiting a file buffer,
rather than always operating on the file of the current buffer as
in older versions. The rest of the mode has been rewritten to
match.
(with-vc-properties): Rewritten to operate on a file list.
(with-vc-file): vc-checkin takes a file list argument now.
(vc-post-command-functions): This hook now receives a file list.
(vc-do-command): Now takes a either a file or a file list as
argument.
(vc-deduce-fileset): New function for deducing a file list to
operate on.
(vc-next-action-on-file): This function is gone, it is merged into
vc-next-action.
(vc-next-action-dired): This function is gone, it is merged into
vc-next-action.
(vc-register): Adapted to the fact that vc-start-entry now takes a
file list.
(vc-register-with): New function.
(vc-start-entry): Now takes a file list argument rather than a
file argument.
(vc-checkout): Modified to cope with vc-start-entry taking a file
list.
(vc-steal-lock): Modified to cope with with-vc-properties taking a
file list.
(vc-checkin): Now takes a file list argument rather than a file
argument.
(vc-finish-logentry): Use the filelist passed by vc-start-entry.
(vc-diff-internal): Completely rewritten for filesets.
(vc-diff-sentinel): New function, tests whether changes were
written into a diff buffer.
(vc-diff): Completely rewritten for filesets.
(vc-version-diff): Completely rewritten for filesets.
(vc-print-log): Now takes a fileset argument.
(vc-revert): Now reverts the entire selected fileset, not just the
current buffer.
(vc-rollback): Now rolls back the entire selected fileset, if
possible. No longer accepts a prefix argument.
(vc-update): Now merges new changes for the entire selected
fileset, not just the current buffer.
(vc-revert-file): Modified to cope with with-vc-properties taking
a file list.
(vc-default-dired-state-info): Add + status suffix if the file is
modified.
(vc-annotate-warp-version): Use the new diff machinery.
(vc-log-edit): Now takes a file list argument rather than a file
argument.
2007-10-10 Michael Albinus <michael.albinus@gmx.de>
Sync with Tramp 2.1.11.

1084
lisp/vc.el
View file

File diff suppressed because it is too large Load diff