1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-12 17:10:43 -08:00
Commit graph

600 commits

Author SHA1 Message Date
Stefan Monnier
100edb42a4 (vc-dired-hook): Use inhibit-read-only. 2007-07-30 17:39:01 +00:00
Dan Nicolaescu
eff23ff376 * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Remove.
(vc-git-revision-completion-table): Enable.

* vc-hooks.el (vc-handled-backends): Add GIT and HG.

* vc.el (vc-directory-exclusion-list): Add .git and .hg.

* vc-hg.el (vc-hg-revision-completion-table): Re-enable.

* diff-mode.el (diff-mode-menu): New entries.

* diff-mode.el (diff-beginning-of-file-and-junk): New function.
(diff-file-kill): Use it.
(diff-beginning-of-hunk): Add arg `try-harder' using it.
(diff-restrict-view, diff-find-source-location, diff-refine-hunk):
Use it so they find the hunk even when we're in the file header.

* vc.el: Add new VC operation `revision-completion-table'.
(vc-default-revision-completion-table): New function.
(vc-version-diff, vc-version-other-window): Use it to provide
completion of revision names if the backend provides it.

* vc-arch.el (vc-arch--version-completion-table)
(vc-arch-revision-completion-table): New functions to provide
completion of revision names.

* vc-cvs.el: Require CL.
(vc-cvs-revision-table, vc-cvs-revision-completion-table):
New functions to provide completion of revision names.

* eval.c (init_eval_once): Bump max_lisp_eval_depth to 400.

* vc2-xtra.texi (Customizing VC): Add GIT and HG.
2007-07-30 00:19:06 +00:00
Masatake YAMATO
9d2aebf649 (vc-dired-mode): Added a menu for VC related
operation. Use backend name as the menu label Suggested by
David Kastrup.
2007-07-28 18:11:25 +00:00
Dan Nicolaescu
625f71cff9 * vc-git.el: Relicense to GPLv3 or later.
(vc-directory-exclusion-list, vc-handled-backends): Remove.

* vc-hooks.el (vc-handled-backends): Add GIT.

* vc.el (vc-directory-exclusion-list): Add .git.

* vc2-xtra.texi (Customizing VC): Add GIT.
2007-07-26 18:44:39 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-26 05:28:10 +00:00
Glenn Morris
b4aa60262c Switch license to GPLv3 or later. 2007-07-25 04:50:21 +00:00
Miles Bader
1e89951587 Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 59-69)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 237-238)

   - Update from CVS

2007-07-23  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/ses.el (ses-cleanup): Prevent Emacs from spuriously checking if the
   underlying file is uptodate.

2007-07-17  Dan Nicolaescu  <dann@ics.uci.edu>

   * lisp/vc.el: Add more info about the vc-registered function.

2007-07-15  Richard M. Stallman  <rms@gnu.org>

   * lisp/kmacro.el (kmacro-bind-to-key): Avoid comparisons on function keys.

   * lisp/tutorial.el (tutorial--find-changed-keys):
   Handle C-x specially like ESC.

2007-07-15  Aaron Hawley  <aaronh@garden.org>

   * lisp/tar-mode.el (tar-get-descriptor): No error for zero-length file.

2007-07-21  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc
   string.

2007-07-16  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-srvr.el (gnus-server-font-lock-keywords): Quote faces.

2007-07-16  Richard M. Stallman  <rms@gnu.org>

   * lispref/display.texi (Defining Faces): Fix previous change.

2007-07-20  Eli Zaretskii  <eliz@gnu.org>

   * src/w32proc.c (IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32):
   Define if not defined.

2007-07-18  Jason Rumney  <jasonr@gnu.org>

   * src/w32proc.c (w32_executable_type): Handle 64 bit executables.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-823
2007-07-24 01:21:32 +00:00
Dan Nicolaescu
3a12f9f830 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
for branches and new files.

* vc-hooks.el (vc-default-mode-line-string): Move mouse-face and
local-map handling ...
(vc-mode-line): ... here. Improve handling of help-echo.

* vc.el (mode-line-string): Document help-echo usage.
2007-07-22 19:04:11 +00:00
Stefan Monnier
d1a607bc74 (vc-delistify): Use mapconcat.
(vc-do-command): Minor simplification.
(vc-expand-dirs): Use push.
2007-07-20 03:59:03 +00:00
Dan Nicolaescu
c0edfa75c4 * vc-hooks.el (vc-default-workfile-unchanged-p): Pass a list
instead of a file.

* vc-hg.el (vc-hg-print-log): Fix for multiple files.

* vc.el: (vc-directory-exclusion-list): Add .hg and .bzr.
(vc-diff-internal): Pass a list instead of a file.
2007-07-20 01:22:18 +00:00
Dan Nicolaescu
ee2f409bc1 (vc-print-log): Fix call to print-log.
(vc-default-comment-history): Likewise.
2007-07-20 00:19:49 +00:00
Dan Nicolaescu
a6ea7ffc20 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
(vc-hg-registered): Replace if with when.
(vc-hg-state): Deal with nonexistent files and handle removed
files.
(vc-hg-dir-state, vc-hg-dired-state-info): New functions.
(vc-hg-checkout): Re-enable.
(vc-hg-create-repo): Fix typos.

* vc.el: Fix typo.

* vc-mcvs.el (vc-mcvs-create-repo): Fix typos.

* vc-bzr.el (vc-bzr-create-repo): New function.
2007-07-20 00:09:17 +00:00
Eric S. Raymond
5ec1c0895f Make certain diff output gets put in the correcct buffer. 2007-07-19 19:59:25 +00:00
Eric S. Raymond
8cdd17b444 Put the lower half (the back-end) of NewVC in place. This commit
makes only the minimum changes needed to get the old vc.el logic
working with the new back ends.
2007-07-18 16:32:40 +00:00
Eric S. Raymond
e4d2689288 Generalize stay-local-p to operatre on lists of files.
Change two keybindings to point to new function names.
2007-07-18 12:43:37 +00:00
Dan Nicolaescu
73770b0319 Add more info about the vc-registered function. 2007-07-17 04:48:56 +00:00
Dan Nicolaescu
9e6da49565 Undo previous change. 2007-07-17 04:47:57 +00:00
Dan Nicolaescu
c5748f4709 * log-view.el (log-view-font-lock-keywords): Use `eval' to consult the
buffer-local value of log-view-*-re if applicable.
2007-07-08 08:18:12 +00:00
Stefan Monnier
cd42ec7d9b (vc-annotate): Jump to line and output message only after the
process is really all done.
2007-07-07 20:46:39 +00:00
Stefan Monnier
7c33af856e (vc-exec-after): Don't move point from the sentinel.
Forcefully read all the remaining text in the pipe upon process exit.
(vc-annotate-display-autoscale, vc-annotate-lines):
Don't stop at the first unrecognized line.
(vc-annotate-display-select): Run autoscale after the process is done
since it depends on the whole result.
2007-07-07 20:37:19 +00:00
Dan Nicolaescu
dc5d263ff3 Fix doc for the checkout function. 2007-07-07 01:53:20 +00:00
Stefan Monnier
4d83a65785 Add new VC operation `revision-completion-table'.
(vc-default-revision-completion-table): New function.
(vc-version-diff, vc-version-other-window): Use it to provide
completion of revision names if the backend provides it.
2007-06-26 17:43:04 +00:00
Stefan Monnier
37a5e97abf (vc-default-log-view-mode): New function.
(vc-print-log): Add new `log-view-mode' VC operation.
2007-06-20 16:32:09 +00:00
Masatake YAMATO
1bd8df7efa * vc.el (vc-dired-hook): check the backend returned from vc-responsible-backend' can really handle subdir'. 2007-06-15 18:50:19 +00:00
Masatake YAMATO
3827b5322a * vc.el (vc-dired-mode): Show backend name as part of mode name. 2007-06-15 13:56:48 +00:00
Stefan Monnier
45fd3a0071 Ensure that update-changelog issues an error when used with
a backend that does not implement it.
(vc-update-changelog-rcs2log): Rename from vc-default-update-changelog.
Remove `backend' argument.  Use expand-file-name.
(vc-cvs-update-changelog, vc-rcs-update-changelog): New aliases.
2007-05-08 04:26:41 +00:00
Glenn Morris
d7a0267c8d Add 2007 to copyright years. 2007-01-21 03:53:13 +00:00
Stefan Monnier
5ce51a98b7 (vc-switch-backend): Try to be more careful with unwanted
side-effect due to mixing various backends's file properties.
2006-10-20 07:58:11 +00:00
Chong Yidong
0f7ea45318 * vc.el (vc-exec-after): Don't delete process manually.
(vc-print-log): Run log-view-mode in process sentinel inside
	inhibit-read-only.  Don't shrink window due to timing issues.
2006-07-11 18:39:32 +00:00
André Spiegel
51ef683bad (vc-diff-internal): Fix prev change. 2006-07-05 08:05:29 +00:00
André Spiegel
48033a08ab (vc-diff-knows-L): New variable.
(vc-diff-internal): Use it to handle "diff" programs that don't
understand -L.  This works automatically, no user action is necessary.
2006-06-23 17:29:19 +00:00
Thien-Thi Nguyen
58ce5535fd (vc-process-filter): Inhibit undo
info collection around call to insert.
(vc-setup-buffer): Likewise for call to erase-buffer.
(vc-do-command): Likewise for call to process-file.
2006-06-05 15:46:00 +00:00
Thien-Thi Nguyen
1867d8cbc5 (vc-annotate): Arrange for point to end up at the same
line number as in the original, but only when using a new buffer.
2006-04-13 13:36:54 +00:00
Thien-Thi Nguyen
1007cd5f2b Remove eol whitespace; nfc. 2006-04-13 13:29:22 +00:00
Stefan Monnier
8a8f8697fe (vc-ensure-vc-buffer): Only change current-buffer, not the window config.
(vc-annotate-display-select): Select the buffer so that current-buffer
(and selected-window) is the output buffer at the end of vc-annotate.
2006-04-11 23:05:31 +00:00
J.D. Smith
da7c8a122c (vc-annotate-display-mode): Made default 'fullscale.
(vc-annotate-color-map): New 18 element constant
	value/saturation, rotating hue colormap, from red->blue.
	(vc-annotate-mode-menu): "Default" -> "By Color Map Range".
	(vc-annotate-display-select): Switch to annotate-mode elsewhere.
	(vc-annotate): To avoid killing the required local variables,
	set them before the end of `with-output-to-temp-buffer', and
	after first switching to annotate-mode.
	(vc-annotate-warp-version): Add buffer argument in goto-line to
	ensure annotation, not source, is scrolled.
	(vc-annotate-color-map): Added custom TTY color map for
	8-color terminals, to use all of the colors in a sensible order.
	256-color terminals work well with the standard map.
	(vc-annotate-lines): Only strip the first color character if it
	is "#", to allow for terminal-style named colors.
	(vc-annotate-warp-version): Pass buf to `goto-line' to ensure
	the correct buffer is scrolled.
2006-04-11 21:42:05 +00:00
Juanma Barranquero
464540ed82 (small-temporary-file-directory): Remove defvar; there's a defcustom for it in
files.el.
2006-02-07 17:02:08 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
André Spiegel
510f6466f3 (vc-default-dired-state-info): Pass FILE to vc-user-login-name.
(vc-default-update-changelog): Don't use vc-user-login-name, we don't
need it here.
2006-01-25 18:55:41 +00:00
Stefan Monnier
97461c846c (vc-annotate-display): Replace optional arg `color-map' with
compulsory arg `ratio'.  Inline body of vc-annotate-time-span.
(vc-annotate-display-autoscale): Adjust call.
(vc-annotate-display-default): Adjust call.  Make arg compulsory.
Fix interactive spec.
(vc-annotate-time-span): Remove.
(vc-annotate-oldest-in-map): Rename from vc-annotate-car-last-cons.
(vc-annotate-mode-menu, vc-annotate-display-autoscale)
(vc-annotate-display-select): Use new name.
2005-12-28 20:13:47 +00:00
Stefan Monnier
07a95b81f4 (vc-annotate-mode-map): Remove obsolete binding.
(vc-annotate-mode-menu): Remove left-over redundant declaration.
Correct the construction of span entries.  Simplify.
(vc-annotate-display-select): Fix the nil case.
(vc-annotate): Remove obsolete (and now broken) code.
(vc-annotate-extract-revision-at-line): Remove obsolete code.
(vc-annotate-time-span): Remove unused arg `quantize'.  Simplify.
2005-12-28 18:47:12 +00:00
Richard M. Stallman
6149bbfbf8 (vc-annotate-car-last-cons): Defn moved up. 2005-12-23 16:22:31 +00:00
Stefan Monnier
04864eb004 Remove unnecessary leading * in docstrings.
(vc-annotate-mode-map): Move initialization into declaration.
(vc-static-header-alist): Nitpick on the regexp.
(vc-default-init-version): New fun.
(vc-register): Use it.
(vc-insert-headers): Use dolist.
(vc-annotate-get-backend): Remove unused function.
(vc-annotate-add-menu): Remove.  Build the menu directly at toplevel.
(vc-annotate-mode): Remove corresponding call.
(vc-annotate-car-last-cons): Simplify.
(vc-annotate-buffers): Remove var.
(vc-annotate-backend): Make it buffer-local.
(vc-annotate): Move the interaction to the interactive spec.
Add a `buf' argument.
(vc-annotate-warp-version): Use this new `buf' argument to avoid
killing&creating a vc-annotate buffer, which is very disruptive when
the buffers are shown in dedicated frames.
2005-12-23 04:57:28 +00:00
Richard M. Stallman
c94dca6021 (vc-default-previous-version, vc-default-next-version)
(vc-do-command): Doc fixes.
2005-12-14 20:11:11 +00:00
Stefan Monnier
d49e540c48 (vc-default-revert): New fun. 2005-12-14 16:57:35 +00:00
Stefan Monnier
11c89a0783 (vc-do-command): Add a new value t for okstatus. 2005-12-13 22:25:13 +00:00
Masatake YAMATO
9a36031fef (vc-directory-exclusion-list): Add "{arch}". 2005-10-31 01:22:57 +00:00
André Spiegel
94ca88e334 (vc-switch-backend): Better error message if the buffer is not visiting a
file under version control.
2005-10-30 10:39:55 +00:00
Michael Albinus
ead915936b * vc.el (vc-dired-mode): Extend comment for binding of
`directory-listing-before-filename-regexp'.
2005-10-25 05:52:28 +00:00
Michael Albinus
9bc260cfb7 * files.el (directory-listing-before-filename-regexp): New
defvar.  Replaces `dired-move-to-filename-regexp' from dired.el.

* dired.el (dired-move-to-filename-regexp): Removed.  All
occurences replaced by `directory-listing-before-filename-regexp'.

* dired-x.el, locate.el, vc.el: Replace
`dired-move-to-filename-regexp' by
`directory-listing-before-filename-regexp'.  In vc.el it is
overwritten locally; maybe this can be handled in files.el too.

* net/ange-ftp.el (ange-ftp-date-regexp): Removed.  All occurences
replaced by `directory-listing-before-filename-regexp'.

* faq.texi (Bugs and problems): Replace
`dired-move-to-filename-regexp' by
`directory-listing-before-filename-regexp'.
2005-10-23 12:17:28 +00:00