1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
Commit Graph

381 Commits

Author SHA1 Message Date
Karoly Lorentey
be8e0e977a Merged in changes from CVS HEAD
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-173
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-174
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-125
2004-03-28 06:08:38 +00:00
Stefan Monnier
8dc87047d1 (vc-maybe-resolve-conflicts): Don't prompt the user. 2004-03-26 16:17:33 +00:00
André Spiegel
cfdc6c099e (vc-print-log): Undo prev change, use new function vc-arg-list from
vc-hooks.el.
2004-03-26 06:07:55 +00:00
Karoly Lorentey
945c3bbb15 Merged in changes from CVS HEAD
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-161
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-162
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-163
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-164
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-165
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-166
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-167
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-168
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-169
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-170
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-171
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-172
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-122
2004-03-25 22:21:45 +00:00
Sam Steingold
5217a76a0b (vc-print-log): backend-function may be a byte-compiled object, not a lambda 2004-03-25 15:39:03 +00:00
Stefan Monnier
81c63b50e2 Document new backend operation `find-file-not-found-hook'. 2004-03-23 21:00:36 +00:00
André Spiegel
ac9ff2091c Add new optional BUFFER argument to vc-BACKEND-print-log and
vc-BACKEND-diff.
(vc-print-log): If the print-log implementation supports it, use the
new BUFFER argument to direct output to *vc-change-log*, not *vc*.
(vc-version-diff, vc-diff-internal): Doc fixes.
2004-03-21 15:42:14 +00:00
Karoly Lorentey
6114b889a2 Merged in changes from CVS HEAD
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-146
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-147
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-148
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-149
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-150
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-151
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-152
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-153
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-154
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-155
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-156
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-157
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-158
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-118
2004-03-16 20:27:22 +00:00
Stefan Monnier
6e54fa536d Document new find-file-hook operation. 2004-03-15 03:55:24 +00:00
Karoly Lorentey
e581a46687 Merged in changes from CVS HEAD
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-71
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-72
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-73
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-74
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-75
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-76
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-77
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-78
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-79
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-80
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-81
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-82
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-83
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
   Add lisp/emacs-lisp/macroexp.el

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-85
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-86
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-87
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-88
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-89
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-90
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-91
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-92
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-93
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-94
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-95
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-96
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-97
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-77
2004-02-17 01:52:25 +00:00
Andreas Schwab
2df5044f34 (with-vc-file): Fix unsafe uses of error.
(vc-cancel-version): Likewise.
2004-02-08 22:42:42 +00:00
Kim F. Storm
4109ce02c4 (line-number-at-pos): Rename from line-at-pos.
Uses changed (what-line and vc-annotate-warp-version).
2004-02-07 00:37:13 +00:00
Karoly Lorentey
9ae44db9cc Merged in changes from CVS HEAD
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-51
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-52
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-62
2004-01-23 21:51:08 +00:00
André Spiegel
64fa2c4f10 (vc-annotate): Fix improper use of `make-local-variable' at the top
level of vc.el.  (Patch by Benjamin Rutt.)
2004-01-23 11:20:55 +00:00
André Spiegel
b6b50160c2 (vc-current-line): Function removed. This is now done by the new
function line-at-pos in simple.el.
(vc-annotate-warp-version): Use line-at-pos instead of
vc-current-line.
2004-01-22 23:34:33 +00:00
Karoly Lorentey
2a36494c42 Merged in changes from CVS HEAD
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-33
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-34
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-35
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-36
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-37
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-38
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-39
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-40
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
   Make fringe-drawing stuff compile without a window-system

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-42
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-43
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-44
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-45
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-46
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-47
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-48
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-49
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-50
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-59
2004-01-22 15:37:19 +00:00
André Spiegel
9311321192 (vc-annotate-mode): Inherit from fundamental-mode and activate
view-mode explicitly.
2004-01-21 11:05:51 +00:00
André Spiegel
1b5a73430e * vc.el (vc-default-previous-version): Doc enhancement.
(vc-default-next-version): New function.
(vc-print-log): New arg FOCUS-REV.
(vc-annotate-mode):  Derives from view-mode now.
(vc-annotate):  New args REVISION, DISPLAY-MODE.
(vc-annotate-prev-version): New function.
(vc-annotate-prev-version): New function.
(vc-annotate-next-version): New function.
(vc-annotate-workfile-version): New function.
(vc-annotate-extract-revision-at-line): New function.
(vc-annotate-revision-at-line): New function.
(vc-annotate-revision-previous-to-line): New function.
(vc-annotate-show-log-revision-at-line): New function.
(vc-annotate-show-diff-revision-at-line): New function.
(vc-current-line): New function.
(vc-annotate-warp-version): New function.
2004-01-20 17:39:09 +00:00
Karoly Lorentey
2e7f2ec031 Merged in changes from CVS HEAD
Patches applied:

 * miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-138
   Update from CVS

 * miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-139
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-15
2003-12-28 16:03:57 +00:00
Markus Rost
3c85843f33 (vc-dired-purge): Avoid error from `kill-line'. 2003-12-24 23:18:10 +00:00
Karoly Lorentey
da1492a4cf tag of miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-137
(automatically generated log message)

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--base-0
2003-12-24 16:09:13 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
John Paul Wallington
0757777795 (vc-annotate-offset): Move defvar up. 2003-07-06 19:09:10 +00:00
Stefan Monnier
d0a0a08a1f (vc-stay-local, vc-stay-local-p): Move to vc-hooks.el. 2003-07-06 17:28:12 +00:00
Richard M. Stallman
c142f96c5a (vc-default-show-log-entry): Use with-no-warnings. 2003-06-30 10:34:26 +00:00
Luc Teirlinck
86a6519064 (vc-rename-file): Fix typo. 2003-06-20 13:21:24 +00:00
Stefan Monnier
1cca5da4fa (vc-directory-exclusion-list): Add MCVS and .svn.
(vc-checkin-hook): Adjust option to new name.
2003-05-31 16:47:57 +00:00
André Spiegel
c6e4435030 (vc-delete-file): Fix free variable reference.
(vc-annotate-display): Remove obsolesence declaration; it isn't
obsolete.
2003-05-26 10:33:00 +00:00
Stefan Monnier
11cdd16709 (vc-log-mode-map, vc-maximum-comment-ring-size)
(vc-comment-ring, vc-comment-ring-index, vc-last-comment-match):
Move vars to log-edit.el.
(vc-new-comment-index, vc-previous-comment, vc-next-comment)
(vc-comment-search-reverse, vc-comment-search-forward)
(vc-comment-to-change-log): Move funs to log-edit.el.
(vc-clear-context): Don't empty the comment-ring.
(vc-finish-logentry): Don't add the comment onto the comment-ring.
2003-05-18 02:53:24 +00:00
Stefan Monnier
a36319a462 New backend functions delete-file' and repository-hostname'.
(vc-stay-local): New var.  Mostly taken from vc-cvs-stay-local.
(vc-stay-local-p): New fun.  Adapted from vc-cvs-stay-local-p.
(vc-diff-switches-list): Revert to the Emacs-21.[123] semantics.
Mark as obsolete.
(vc-delete-file): New command.
(vc-default-rename-file): New function.
(vc-rename-file): Use it.
Be careful to disallow renaming if the file is locked or out-of-date.
(vc-ensure-vc-buffer, vc-next-action-on-file, vc-insert-headers)
(vc-cancel-version, vc-annotate): Use buffer-file-name variable.
2003-05-09 16:33:10 +00:00
Stefan Monnier
b4e4e3a832 (with-vc-properties, with-vc-file, edit-vc-file):
Add `declare's for debugging and indentation.
(vc-do-command): Use `remq'.
(vc-buffer-context): Remove unused var `curbuf'.
(vc-next-action-dired): Remove unused var `dired-dir'.
(vc-switches): New fun.
(vc-diff-switches-list): Use it.
(vc-dired-hook): Remove unused var `cvs-dir'.
(vc-dired-purge): Remove unused var `subdir'.
(vc-cancel-version): Remove unused var `config'.
(vc-rename-master): Use dolist iso mapcar.
(vc-rename-file): Remove redundant tests.
Clear the properties of the old file name.
(vc-annotate): Pass the complete filename to `annotate-command'.
(vc-annotate-lines): Remove unused var `overlay'.
2003-05-08 17:41:16 +00:00
André Spiegel
2807bd9194 (vc-binary-assoc, vc-binary-suffixes): Removed; these were
accidentally left over.
2003-02-19 19:00:51 +00:00
Juanma Barranquero
bf142f280f (vc-annotate-display, vc-checkout-carefully): Add obsolescence declaration and
remove redundant info from docstring.
2003-02-05 23:13:21 +00:00
Juanma Barranquero
f1180544bb Trailing whitespace deleted. 2003-02-04 12:29:42 +00:00
André Spiegel
4279775b92 (vc-next-action-on-file): Use t argument to vc-checkout in
order to get the latest version on the current branch.  Update
documentation of vc-BACKEND-checkout to explain this.
2002-12-26 14:04:21 +00:00
André Spiegel
570050dc43 Add comment to prev change. 2002-11-03 15:08:29 +00:00
André Spiegel
62c2e775ec (vc-dired-move): Adapt dired-move-to-filename-regexp to its current
version in dired.el.
2002-11-03 14:48:37 +00:00
André Spiegel
685e7bcac0 (vc-dired-reformat-line): Simplified. Handles text properties
correctly now.
2002-10-14 15:13:59 +00:00
André Spiegel
b9a35ba58a (vc-dired-reformat-line): As a temporary fix, remove all text
properties from the reformatted line.
2002-10-11 09:36:00 +00:00
Stefan Monnier
fd8160f74d (vc-find-version): Use the new backend op `find-version'.
(vc-default-find-version): Provide the new backend op `find-version'
in terms of the old `checkout' op.
2002-10-08 15:31:43 +00:00
Stefan Monnier
1168d6c273 (vc-resolve-conflicts); Typo. 2002-10-07 16:50:43 +00:00
Stefan Monnier
edc37d1214 (vc-maybe-resolve-conflicts): Always call vc-resolve-conflicts
in case some other package redefined it.
(vc-resolve-conflicts): Make it into an alias for smerge-ediff.
2002-10-07 16:24:42 +00:00
Stefan Monnier
928ef6d986 (vc-log-mode-map): Explicitly inherit from text-mode.
(vc-maybe-resolve-conflicts): Don't check smerge-mode and smerge-ediff.
(vc-print-log): Don't check log-view-mode.
(vc-default-show-log-entry): Don't check log-view-goto-rev.
(vc-log-mode): Remove.
(vc-log-edit): Don't check log-edit.
2002-10-05 16:35:28 +00:00
Markus Rost
48e9072d7e (vc-default-show-log-entry): Fix typo. 2002-10-05 03:01:29 +00:00
Stefan Monnier
02e43de8af (vc-print-log): Unconditionally use `show-log-entry'.
(vc-default-show-log-entry): New fun.
2002-10-03 22:43:01 +00:00
André Spiegel
fd4ca8fb12 (vc-workfile-unchanged-p, vc-default-workfile-unchanged-p): Moved to
vc-hooks.el.
2002-09-04 20:47:08 +00:00
André Spiegel
b4c4047461 (vc-next-action-on-file): Preserve find-file-literally. 2002-07-22 18:52:04 +00:00
André Spiegel
655388b5d4 Improve comment of vc-BACKEND-workfile-unchanged-p. 2002-07-19 13:20:02 +00:00
Stefan Monnier
f66a6225b9 (vc-default-comment-history): Hard code *vc*.
This is because print-log always prints there now.
(vc-annotate-font-lock-keywords): New var.
(vc-annotate-mode): Use it.  Set truncate-lines as well.
(vc-annotate-display-select): Unify the two error reports.
(vc-annotate-offset): New var.
(vc-annotate-lines): New fun extracted from vc-annotate-display.
(vc-annotate-display): Use it, via font-lock.
2002-07-16 20:44:23 +00:00
André Spiegel
165e43b6c7 (vc-next-action-on-file): Ignore buffer-read-only while comparing to
file on disk.  Fix the case when claiming the lock on a file that has
unlocked changes.
(vc-log-mode): Don't mention vc-toggle-read-only in the doc
string.
2002-07-16 17:47:33 +00:00