1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-11 16:40:45 -08:00
Commit graph

81 commits

Author SHA1 Message Date
Andreas Schwab
639b2760f1 Merge from emacs-23 2010-06-10 00:08:50 +02:00
Dan Nicolaescu
00fd1147bf Add optional support for resetting VC properties.
* lisp/vc-dispatcher.el (vc-resynch-window): Add new optional argument,
call vc-file-clearprops when true.
(vc-resynch-buffer): Add new optional argument, pass it down.
(vc-resynch-buffers-in-directory): Likewise.
2010-06-08 23:48:29 -07:00
Stefan Monnier
8c6eab5a27 * lisp/vc-dispatcher.el: Rename mode-line-hook to vc-mode-line-hook;
declare it, make it buffer-local, and permanent-local.
(vc-resynch-window): Adjust name.
* lisp/vc-hooks.el (vc-find-file-hook): Adjust name.

Fixes: debbugs:6324
2010-06-08 21:12:53 -04:00
Stefan Monnier
e97a42c15b Make the log-edit comments use RFC822 format throughout.
* vc.el (vc-checkin, vc-modify-change-comment):
Adjust to new vc-start/finish-logentry.
(vc-find-conflicted-file): New command.
(vc-transfer-file): Adjust to new vc-checkin.
(vc-next-action): Improve scoping.

* vc-hg.el (vc-hg-log-edit-mode): Remove.
(vc-hg-checkin): Remove extra arg.  Use log-edit-extract-headers.

* vc-git.el (vc-git-log-edit-mode): Remove.
(vc-git-checkin): Remove extra arg.  Use log-edit-extract-headers.
(vc-git-commits-coding-system): Rename from git-commits-coding-system.

* vc-dispatcher.el (vc-log-edit): Shorten names for log-edit-show-files.
(vc-start-logentry): Remove argument `extra'.
(vc-finish-logentry): Remove extra args.

* vc-bzr.el (vc-bzr-log-edit-mode): Remove.
(vc-bzr-checkin): Remove extra arg.  Use log-edit-extract-headers.
(vc-bzr-conflicted-files): New function.

* log-edit.el (log-edit-extra-flags)
(log-edit-before-checkin-process): Remove.
(log-edit-summary, log-edit-header, log-edit-unknown-header): New faces.
(log-edit-headers-alist): New var.
(log-edit-header-contents-regexp): New const.
(log-edit-match-to-eoh): New function.
(log-edit-font-lock-keywords): Use them.
(log-edit): Insert a "Summary:" header as default.
(log-edit-mode): Mark font-lock rules as case-insensitive.
(log-edit-done): Cleanup headers.
(log-view-process-buffer): Remove.
(log-edit-extract-headers): New function to replace it.
2010-04-20 22:05:24 -04:00
Stefan Monnier
cb4f951325 * vc-dispatcher (vc-finish-logentry): Don't mess with the windows/frames. 2010-04-20 12:52:43 -04:00
Glenn Morris
549f324afb * vc-dispatcher.el (vc-start-logentry): Doc fix.
(log-view-process-buffer, log-edit-extra-flags): Declare.
2010-03-23 20:30:53 -07:00
Juanma Barranquero
b0287b39f2 lisp/vc-dispatcher.el (vc-do-command): Remove reference to `vc-path'. 2010-03-19 15:19:54 +01:00
Dan Nicolaescu
09158997b5 Add special markup processing for commit logs.
* log-edit.el (log-edit-extra-flags): New variable.
(log-edit): Add new argument MODE.  Use that mode when non-nil
instead of the log-view-mode.
(log-view-process-buffer): New function.

* vc.el: Document that the checkin method takes optional
arguments.  Document new backend specific method: log-view-mode.
(vc-default-log-edit-mode): New function.
(vc-checkin): Use a backend specific log-view-mode.
Pass extra arguments to the checkin method.
(vc-modify-change-comment): Pass a dummy extra argument.

* vc-dispatcher.el (vc-log-edit): Add a mode argument, pass it to
log-edit.
(vc-start-logentry): Add a mode argument, pass it to vc-log-edit.
(vc-finish-logentry): Process the log buffer before passing it
down.  Pass log-edit-extra-flags.

* vc-bzr.el (vc-bzr-checkin): Pass extra arguments to the commit
command.
(log-edit-extra-flags, log-edit-before-checkin-process): New declarations.

* vc-hg.el (vc-hg-checkin): Pass extra arguments to the commit
command.
(log-edit-extra-flags, log-edit-before-checkin-process): New declarations.
(vc-hg-log-edit-mode): New derived mode.

* vc-arch.el (vc-arch-checkin):
* vc-cvs.el (vc-cvs-checkin):
* vc-git.el (vc-git-checkin):
* vc-mtn.el (vc-mtn-checkin):
* vc-rcs.el (vc-rcs-checkin):
* vc-sccs.el (vc-sccs-checkin):
* vc-svn.el (vc-svn-checkin): Add an optional ignored argument.
2010-03-19 02:37:41 -07:00
Chong Yidong
d4efdaea76 * vc-dispatcher.el (vc-do-command): Set LC_MESSAGES, so that we
can parse the output of the external commands (Bug#5279).
2010-01-16 16:37:46 -05:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Stefan Monnier
cf88559514 (vc-resynch-window): Don't revert a buffer which has no associated file.
(vc-resynch-buffer): Use vc-dir-buffers.
2009-10-01 03:32:25 +00:00
Dan Nicolaescu
4096c5f2f0 (vc-do-command): Return the process object in
the asynchronous case.  Use when instead of if.  Do not run
vc-exec-after to display a message if not enabled.
2009-09-20 19:55:36 +00:00
Dan Nicolaescu
3c53763cf2 (vc-resynch-window): Update comment. 2009-08-07 08:24:29 +00:00
Dan Nicolaescu
ba83b7b62f * vc-dispatcher.el (vc-resynch-buffers-in-directory): Make sure
the buffer we try to sync is current when calling
vc-resynch-buffer.

* vc-dir.el (vc-dir-resynch-file): Make sure vc-dir-update does
not show up to date files.
2009-07-24 05:41:17 +00:00
Glenn Morris
ae940284fa Add 2009 to copyright years. 2009-01-05 03:18:22 +00:00
Michael Albinus
4d3d4310d8 * vc-dispatcher.el (vc-do-command): Let asynchronous processes run
also for remote directories.
2008-08-14 19:28:44 +00:00
Dan Nicolaescu
d923f4ac08 * vc-dir.el (vc-dir-find-child-files): New function.
(vc-dir-resync-directory-files): New function.
(vc-dir-recompute-file-state): New function, broken out of ...
(vc-dir-resynch-file): ... here.  Also deal with directories.
* vc-dispatcher.el (vc-resynch-buffers-in-directory): New function.
(vc-resynch-buffer): Use it.
2008-07-05 18:09:32 +00:00
Dan Nicolaescu
74d0991fc5 * vc.el:
* vc-hooks.el:
* vc-dispatcher.el: Move vc-dir variables and functions ...
* vc-dir.el: ... here.  New file.
* Makefile.in (ELCFILES): Add vc-dir.elc.
2008-06-22 19:04:22 +00:00
Stefan Monnier
7b74a6f9f0 (vc-dir-child-files): Use vc-string-prefix-p.
(vc-dir-marked-only-files): vc-string-prefix-p.
2008-06-16 20:36:55 +00:00
Glenn Morris
6b9ebb348a (vc-dir-mode): Check tool-bar-mode is bound. 2008-06-12 03:49:52 +00:00
Andreas Schwab
64137cbc07 (vc-dir-children-marked-p): Fix child check. 2008-06-08 15:31:08 +00:00
Andreas Schwab
c99657a558 (vc-dir-move-to-goal-column): Don't move in an
empty line.
2008-06-08 14:53:18 +00:00
Stefan Monnier
8d27bcdf2e (vc-dir-menu-map-filter): Don't fail if vc-client-mode is not set. 2008-06-03 07:56:02 +00:00
Dan Nicolaescu
e02d8ae787 * vc-dispatcher.el (vc-directory-resynch-file): Rename to ...
(vc-dir-resynch-file): ... this.  Update callers.
Use vc-string-prefix-p.  Ignore directory args.
(vc-string-prefix-p): CSE.
(vc-resynch-buffer): Restore conditional.

* vc-hooks.el (vc-after-save): Improve test.
(vc-mode-line): Fix indentation.
2008-05-27 05:36:03 +00:00
Stefan Monnier
3561170332 (vc-string-prefix-p): New function.
(vc-dir-parent-marked-p): Use it.
2008-05-27 01:13:25 +00:00
Dan Nicolaescu
af71bb11ac (vc-dir-child-files): New function.
(vc-dir-node-directory): New function.
(vc-dir-update, vc-dir-parent-marked-p)
(vc-dir-children-marked-p, vc-dir-mark-all-files)
(vc-dir-marked-only-files, vc-dispatcher-selection-set): Use it.
2008-05-26 23:49:35 +00:00
Dan Nicolaescu
592da08ebd (vc-resynch-window): Fix mode-line updating. 2008-05-26 23:40:15 +00:00
Dan Nicolaescu
d002d68fdc (vc-dir-previous-directory): Rename from
vc-dir-prev-directory for consistency with vc-dir-previous-line.
(vc-dir-mode-map): Fix bindings.
2008-05-18 07:33:07 +00:00
Glenn Morris
b1d87c1084 Fix typos. 2008-05-17 22:55:57 +00:00
Glenn Morris
fde92a8128 Fix comment typo. 2008-05-17 20:11:43 +00:00
Andreas Schwab
53b2b69f6f (vc-dir-mode-map): Fix M-down and M-up binding. 2008-05-17 20:00:41 +00:00
John Paul Wallington
1915fb444e (top-level): Revert previous change: require cl when compiling. 2008-05-17 00:04:07 +00:00
John Paul Wallington
c8039c6b14 (top-level): Don't require cl when compiling.
(vc-dir-mode-map): Fix backquote.
(vc-at-event): Doc fix.  Use `make-symbol' instead of `gensym'.
2008-05-16 22:39:45 +00:00
Eric S. Raymond
e6d897b38e Comment fix. 2008-05-15 15:02:57 +00:00
Eric S. Raymond
400aec1ab3 More elimination of buffer name dependencies. 2008-05-15 15:01:29 +00:00
Eric S. Raymond
d536a90488 Remove assumptions about buffer names. 2008-05-15 14:32:49 +00:00
Eric S. Raymond
97275f80a9 Move vc-dir menu hook back to vc-dispatcher. 2008-05-15 13:50:55 +00:00
Eric S. Raymond
373b651983 Fix an incorrect buffer name and remove an unneeded defalias. 2008-05-15 12:36:31 +00:00
Eric S. Raymond
6986e5c978 Eliminate exoensive (vc-expand-dirs) calls. 2008-05-15 01:11:23 +00:00
Dan Nicolaescu
08a1ccb0d8 Fix typo. 2008-05-11 15:36:33 +00:00
Eric S. Raymond
f919e79468 Typo fix. 2008-05-11 14:50:25 +00:00
Eric S. Raymond
dab6808215 Prevent some compilaation warnings. 2008-05-11 14:49:39 +00:00
Dan Nicolaescu
922320a982 (ewoc): Require. 2008-05-10 21:52:36 +00:00
Dan Nicolaescu
d9a3d80e56 (vc-hooks, ewoc): Require.
(vc-log-edit, vc-buffer-sync): Declare for byte compiler.
2008-05-10 19:21:30 +00:00
Eric S. Raymond
2888a97eb5 Remove assumption about what nil means as a first arument to vc-do-command. 2008-05-10 13:27:16 +00:00
Eric S. Raymond
2cd5294d11 New functions implementing motion to next and previous directory. 2008-05-10 12:40:57 +00:00
Eric S. Raymond
cb5d44b66d Dupport an use an observer flag in (vc-dispatcher-selection-set). 2008-05-09 20:17:50 +00:00
Eric S. Raymond
79ac8f50ea VC directory bindings are noew documented. 2008-05-09 20:07:01 +00:00
Eric S. Raymond
edbde3530b Suppress an annoying warning. 2008-05-09 19:10:29 +00:00
Eric S. Raymond
06ad7cd861 Comment and to-do list fixes. 2008-05-09 18:59:45 +00:00