summaryrefslogtreecommitdiff
path: root/lisp/vc
Commit message (Expand)AuthorAgeFilesLines
* Silence warning for unused `dotimes' counter variables.Juanma Barranquero2011-06-022-5/+5
* Implement primitive `sha1' and remove sha1.elLeo Liu2011-05-241-3/+9
* Don't quote lambda expressions with `quote'.Stefan Monnier2011-05-233-5/+5
* * lisp/vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark.Stefan Monnier2011-05-231-0/+1
* Maked "edited" tag stand out in vc-dir (Bug#8178).Jari Aalto2011-05-221-0/+1
* Fix diff-changed face definition.Chong Yidong2011-05-221-2/+7
* Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd@stupidchicken.com.Glenn Morris2011-05-161-40/+40
* * lisp/vc/diff-mode.el: Fix paren typo.Glenn Morris2011-05-151-41/+41
* Fix minor bug of diff-fixup-modifs on small diffs (Bug#8672).Chong Yidong2011-05-151-39/+41
* Bind = to diff command in vc-annotate mode (Bug#8671)Chong Yidong2011-05-151-0/+1
* add-log font-lock fix for mutilple authors (bug#8644)Glenn Morris2011-05-141-1/+1
* add-log.el fix for multiple author entries (bug#8645)Glenn Morris2011-05-141-3/+7
* Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.Glenn Morris2011-05-121-2/+2
* Silence diff-mode.el compilation.Glenn Morris2011-05-051-1/+4
* Fix description of diff.elLeo Liu2011-05-021-1/+1
* Add vc-annotate-goto-line.Chong Yidong2011-04-241-0/+32
* lisp/vc/vc.el (ediff-vc-internal): Declare function.Juanma Barranquero2011-04-211-0/+2
* * lisp/vc/vc.el (vc-version-ediff): Call ediff-vc-internal directly, sinceStefan Monnier2011-04-201-4/+2
* * lisp/vc/vc.el (vc-diff-build-argument-list-internal)Christoph Scholtes2011-04-201-36/+82
* * lisp/vc/add-log.el (change-log-font-lock-keywords): Add "Thanks to" to ackn...Sam Steingold2011-04-181-1/+1
* Merge changes from emacs-23 branchChong Yidong2011-04-081-1/+1
* log-edit.el fix for bug#7598.Glenn Morris2011-04-071-2/+15
* Merge from lexical-binding branch.Stefan Monnier2011-04-015-54/+60
|\
| * Merge from trunkStefan Monnier2011-03-311-3/+0
| |\
| * \ Merge from trunkStefan Monnier2011-03-217-38/+63
| |\ \
| * | | Misc fixes, and use lexical-binding in more files.Stefan Monnier2011-03-115-52/+58
| * | | Merge from trunkStefan Monnier2011-03-068-58/+72
| |\ \ \
| * | | | Compute freevars in cconv-analyse.Stefan Monnier2011-02-261-2/+2
* | | | | * lisp/vc/add-log.el (add-change-log-entry): Don't use whitespaceJason Merrill2011-03-301-2/+2
| |_|_|/ |/| | |
* | | | Remove leftover (require 'wid-edit)Leo Liu2011-03-211-3/+0
| |_|/ |/| |
* | | Merge changes from emacs-23 branchChong Yidong2011-03-191-9/+14
* | | * vc/diff-mode.el (diff-mode-map): Shadow problematic bindings fromStefan Monnier2011-03-181-9/+12
* | | Fix misuse of quote in `case'.Stefan Monnier2011-03-152-6/+6
* | | lisp/vc/vc-bzr.el (vc-bzr-state): Handle bzr 2.3.0 (follow-up to bug#8170).Juanma Barranquero2011-03-121-2/+7
* | | * lisp/vc/vc-hg.el (vc-hg-pull, vc-hg-merge-branch): Use vc-hg-program.Glenn Morris2011-03-101-3/+4
* | | Add `vc-git-program' option; suggested on emacs-devel.Glenn Morris2011-03-101-7/+15
* | | vc.el fix for bug#6146.Glenn Morris2011-03-071-1/+4
* | | * lisp/vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt.Glenn Morris2011-03-071-1/+1
| |/ |/|
* | Replace many instances of read-file-name with read-directory-name.Antoine Levitt2011-03-053-9/+9
* | * lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Handle bzr 2.3.0. (Bug#8170)Glenn Morris2011-03-041-32/+34
* | * lisp/vc/diff-mode.el (diff-mode): Fix whitespace-style. (Bug#8139)Leo Liu2011-03-041-1/+1
* | ediff-init.el fix for bug#1821. (tiny change)David Abrahams2011-03-031-2/+2
* | * lisp/vc/vc-rcs.el: Remove some ancient comments.Glenn Morris2011-03-021-8/+4
* | vc-dir fix for bug#7349.Bob Rogers2011-03-021-0/+1
* | vc-svn fix for bug#7663 on MS Windows. (tiny change)Vagn Johansen2011-03-021-1/+3
* | vc-bzr fix for bug#8025.Glenn Morris2011-03-021-5/+18
|/
* Improvements to vc-bzr conffile handling and pull/merge support.Chong Yidong2011-02-192-26/+54
* Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.caGlenn Morris2011-02-191-8/+12
* vc.el fix for bug#4496.Glenn Morris2011-02-161-3/+0
* Add Log View toggle and log format customization for Git and Hg.Chong Yidong2011-02-134-58/+126