aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
Commit message (Expand)AuthorAgeFilesLines
* * lisp/vc/pcvs.el (cvs-cleanup-collection): Extend meaning of `rm-handled'.Stefan Monnier2013-01-081-9/+11
* Try to handle buffer/file modifications which conflict with VCS locking.Chong Yidong2013-01-062-13/+30
* Merge from emacs-24; up to 2012-12-06T01:39:[email protected]Paul Eggert2013-01-0239-42/+45
|\
| * Update copyright notices for 2013.Paul Eggert2013-01-0139-41/+42
| * * lisp/vc/log-edit.el (log-edit-header-contents-regexp): Add doc string.Glenn Morris2012-12-311-1/+3
* | * vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'.Dmitry Antipov2012-12-201-3/+3
* | * lisp/vc/diff-mode.el (diff-post-command-hook): Don't ignore changes at theStefan Monnier2012-12-191-1/+1
* | * lisp/vc/ediff-util.el (ediff-buffer-type): New function.Dave Abrahams2012-12-141-7/+15
* | Merge from emacs-24; up to 2012-11-26T19:56:[email protected]Glenn Morris2012-12-091-5/+3
|\|
| * lisp/vc/vc-hooks.el (vc-state): Doc fix.Juanma Barranquero2012-12-071-5/+3
* | Add conflict detection/resolution to vc-hg (bug#10709)Glenn Morris2012-12-041-1/+30
* | Obsolete longlines.el.Chong Yidong2012-12-041-98/+47
* | * lisp/vc/vc.el (vc-delete-file, vc-rename-file): Default to theDmitry Gutov2012-12-031-4/+13
* | Fix use of buffer-file-truename in vc-find-file-hook (tiny change).Yuya Nishihara2012-12-011-2/+3
* | Modularize add-log-current-defun.Chong Yidong2012-12-011-86/+18
* | * vc-hg.el (vc-hg-next-revision): Ensure use of default "tip" output formatKirk Kelsey2012-11-301-1/+1
* | * vc/vc-git.el (vc-git-command): Disable the pager.Chong Yidong2012-11-301-1/+1
* | Relax existing-registration check in vc-register (tiny change).OKAZAKI Tetsurou2012-11-301-6/+4
* | Add desktop support for restoring vc-dir buffers (bug#10606)Glenn Morris2012-11-281-0/+29
* | Merge from emacs-24; up to 2012-11-20T20:06:[email protected]Glenn Morris2012-11-261-1/+3
|\|
| * vc-hooks.el workaround for bug#11490Glenn Morris2012-11-261-1/+3
* | * lisp/vc/diff-mode.el (diff-hunk): Don't make useless timers.Stefan Monnier2012-11-191-13/+15
* | Merge from emacs-24; up to 2012-11-15T23:31:[email protected]Glenn Morris2012-11-171-1/+1
|\|
| * Fix for vc-svn-merge-news.Chong Yidong2012-11-171-1/+1
* | Merge from emacs-24; up to 2012-11-08T14:54:[email protected]Glenn Morris2012-11-101-30/+66
|\|
| * Rewrite and rename diff-delete-trailing-whitespace.Chong Yidong2012-11-091-30/+66
| * Document diff-remove-trailing-whitespaceGlenn Morris2012-11-081-6/+6
* | * lisp/vc/vc-svn.el (vc-svn-state-heuristic): Avoid calling svn.Glenn Morris2012-11-031-1/+16
|/
* * lisp/vc/diff-mode.el (diff-context->unified): Don't get confused by "hunkStefan Monnier2012-10-291-6/+8
* * vc/vc-hooks.el (vc-file-clearprops): Kill vc-parent-buffer.Chong Yidong2012-10-291-0/+2
* * lisp/vc/diff-mode.el (diff-end-of-hunk): Also skip potential "no LF at eol".Stefan Monnier2012-10-261-7/+16
* * lisp/vc/diff-mode.el (diff-hunk): `save-excursion' while refining.Stefan Monnier2012-10-231-2/+3
* Cleanup uses of "-hooks".Stefan Monnier2012-10-231-2/+3
* Fix *vc-diff* buffer's behavior for empty diffs.Chong Yidong2012-10-201-9/+9
* * lisp/vc/diff-mode.el (diff--auto-refine-data): New var.Stefan Monnier2012-10-011-2/+20
* * lisp/vc/add-log.el (add-log-buffer-file-name-function): Demote to defvarStefan Monnier2012-10-011-8/+4
* Support git commit --amend/--signoffDmitry Gutov2012-10-022-15/+83
* * lisp/facemenu.el (list-colors-sort): Add option "Luminance".Juri Linkov2012-09-303-3/+3
* * lisp/vc/pcvs.el (cvs-cleanup-collection): Keep entries that are currentlyStefan Monnier2012-09-292-6/+23
* * lisp/vc/log-edit.el (log-edit-font-lock-keywords): Ignore case toStefan Monnier2012-09-291-5/+8
* * lisp/vc/ediff-util.el (ediff-diff-at-point): Don't assume point-min==1.Stefan Monnier2012-09-291-2/+2
* Comment fixGlenn Morris2012-09-291-2/+2
* Remove duplication of vc-sccs-registered definitionGlenn Morris2012-09-291-7/+6
* Comment for vc-rcsGlenn Morris2012-09-291-0/+3
* Comment for vc-sccsGlenn Morris2012-09-291-0/+3
* Comments for vc-bzr, clarifying vc-bzr-registeredGlenn Morris2012-09-291-6/+8
* Revert bogus vc autoloads changeGlenn Morris2012-09-292-2/+5
* No need to autoload vc-rcs, vc-sccs defcustoms.Glenn Morris2012-09-292-5/+2
* Don't bother making files writable for commit with modern VCSGlenn Morris2012-09-261-18/+21
* Use declare forms, where possible, to mark obsolete functions.Chong Yidong2012-09-253-8/+5