1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-29 11:02:01 +00:00
Commit Graph

483 Commits

Author SHA1 Message Date
Eric S. Raymond
ccd9fab66a Restore vc-next-action functionality of registering files. 2007-10-20 21:02:46 +00:00
Eric S. Raymond
e0752dd75b Condition out a misleading message. 2007-10-20 16:34:44 +00:00
Stefan Monnier
a7192ddb04 Remove diff-tree' operation, now subsumed by diff'.
Also `revision-completion-table' now takes a list of files.
(vc-deduce-fileset): Remove unused var `regexp'.
Only obey allow-directory-wildcard in dired buffers.
(vc-default-diff-tree): Remove.
(vc-diff-added-files): New var.
(vc-diff-internal): Use it.  Remove arg `backend'.  Update callers.
(vc-version-diff): Revert from `vc-history-diff' to the original name.
Remove the `backend' arg.
(vc-contains-version-controlled-file): Remove.
(vc-diff): Bring it closer to the version in Emacs-22.
(vc-revert): Fix typo in let-binding.
(vc-default-unregister): Remove.
(vc-dired-buffers-for-dir): Remove N^2 behavior.
2007-10-19 20:59:49 +00:00
Stefan Monnier
17f3909f61 (vc-diff-sentinel, vc-diff-internal): Revert some changes in the
behavior unrelated to filesets.
2007-10-17 16:22:27 +00:00
Dan Nicolaescu
5e8b0a322e Fix previous change. 2007-10-11 23:32:32 +00:00
Dan Nicolaescu
f509e24555 * vc.el (vc-deduce-fileset): Delete unused code.
(vc-next-action): Fix typos.
2007-10-11 22:21:17 +00:00
Eric S. Raymond
f23c992e98 Corrected version of Juanma's fix patch.
.
2007-10-11 16:53:58 +00:00
Eric S. Raymond
0438c6910a Fix evaluation time of a macro arument. 2007-10-11 16:37:42 +00:00
Eric S. Raymond
ebd0c5ba61 Bug fixes by Juanma Barranquero. Temporarily disable the check for
his edge case, it's calling some brittle code.
2007-10-11 15:29:58 +00:00
Eric S. Raymond
727c4443eb Address an edge case in vc-diff. This is an experimental fix and may change. 2007-10-11 15:13:29 +00:00
Eric S. Raymond
ac3f4c6f02 Terminology cleanup. 2007-10-10 18:52:45 +00:00
Eric S. Raymond
d7b60083ce Merge in new VC with filesets. 2007-10-10 13:17:53 +00:00
Miles Bader
1af74d06e5 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
2007-10-09 08:52:57 +00:00
Eric S. Raymond
ce27c5c542 Remove unused code. 2007-10-08 23:21:09 +00:00
Eric S. Raymond
3f57aeb7d0 Correct a bug that was revealed during a review of new VC. 2007-10-08 23:18:31 +00:00
Eric S. Raymond
d6ba9c398e Typo and whitespace fixes to reduce the diff with new VC. 2007-10-06 14:36:09 +00:00
Eric S. Raymond
61de26cb85 Port various comments from new VC to reduce the noise in the diff.
Rename vc-revert-buffer1 to vc-revert-buffer-internal.
Patch in the new vc-create-repo function to go with the
header comment about it already present.
No changes to existing logic.
2007-10-06 11:14:32 +00:00
Eric S. Raymond
0d0e935627 Terminology sync, workfile version -> focus version. 2007-10-06 08:56:58 +00:00
Dan Nicolaescu
2765044b39 Reorder functions, no code changes. 2007-10-05 04:35:37 +00:00
Dan Nicolaescu
5e8c0b8b36 Mention all supported VC backends. 2007-09-22 17:17:22 +00:00
Dan Nicolaescu
793a22023e * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
* vc-hooks.el (vc-menu-entry): New var.
(vc-mode-line-map): Use it so that this menu also uses the extra-menu.
(menu-bar-tools-menu): Add the VC menu here rather than in menu-bar.el.
(vc-menu-map): Declare and initialize in one step.

* menu-bar.el (vc-menu-map): Don't setup any more.
Instead, just create the proper spot in the menu.

* vc.el: Document new VC operation `extra-menu'.

* vc-hooks.el (vc-default-extra-menu, vc-menu-map-filter): New
function.
2007-09-18 01:28:25 +00:00
Stefan Monnier
86e80023f4 (vc-process-sentinel): New function.
(vc-exec-after): Use it instead of using ugly hackish analysis and
construction of Elisp code.
(vc-sentinel-movepoint): New dynamically scoped var.
(vc-print-log, vc-annotate): Set it to move the user's point.
2007-09-15 22:25:55 +00:00
Dan Nicolaescu
d920b27aea (vc-default-diff-tree): Pass a list to the diff vc command
instead of a file.
2007-09-06 05:28:08 +00:00
Glenn Morris
f4f6d1ed13 Remove CVS $Id$ header. Comment. 2007-09-03 06:18:58 +00:00
Miles Bader
7f22a76506 Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 97-100)

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

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-860
2007-08-27 04:00:19 +00:00
Dan Nicolaescu
a549ce7054 * vc-hooks.el (vc-registered): Use mapc instead of mapcar.
(vc-delete-automatic-version-backups): Likewise.

* vc.el (vc-dired-buffers-for-dir): Likewise.
2007-08-26 00:32:23 +00:00
Stefan Monnier
0f67ac3871 *** empty log message *** 2007-08-23 20:12:07 +00:00
Stefan Monnier
79f47f3842 (vc-annotate-warp-version): Don't use previous-line. 2007-08-21 16:24:21 +00:00
Miles Bader
37cc095b6a Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
2007-08-13 13:41:28 +00:00
Glenn Morris
4837b516ea Replace `iff' in doc-strings and comments. 2007-08-08 07:40:09 +00:00
Stefan Monnier
ebaac04d91 (vc-annotate): Select temp-buffer before running vc-exec-after.
Select the buffer's window before moving point.
2007-08-07 03:32:24 +00:00
Jason Rumney
a92b30a61e (vc-rollback): Add norevert argument back.
(vc-revert-buffer): Add back as obsolete alias.
2007-08-05 21:46:00 +00:00
Dan Nicolaescu
cb223bba1d * vc.el: Document new VC operation `extra-menu'.
* vc-hooks.el (vc-default-extra-menu): New function.

* menu-bar.el (menu-bar-vc-filter): New function.
(menu-bar-tools-menu): Use it as a filter.
2007-08-01 17:13:45 +00:00
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