delta/emacs.git - git.savannah.gnu.org: git/emacs.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Nuke arch-tags.	Glenn Morris	2011-01-15	1	-1/+0
\|
*	* lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively.	Stefan Monnier	2011-01-14	1	-2/+71
\| \| \| \| \| \| \| \|	(smerge-resolve--normalize-re): New var. (smerge-resolve--extract-comment, smerge-resolve--normalize): New funs. (smerge-resolve): Use them. * lisp/newcomment.el (comment-only-p): New function. (comment-or-uncomment-region): Use it.
*	Merge from emacs-23	Stefan Monnier	2011-01-14	1	-1/+1
\|
*	* lisp/vc/smerge-mode.el (smerge-refine): Choose better default part to	Stefan Monnier	2010-11-12	1	-0/+4
\| \| \| \|	highlight when one of them is empty.
*	* lisp/finder.el (finder-known-keywords): Add keyword "vc"	Juri Linkov	2010-06-11	1	-1/+1
\| \| \| \| \| \| \| \| \|	for version control. * add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff.el, * emerge.el, log-edit.el, log-view.el, pcvs.el, smerge-mode.el, * vc-annotate.el, vc-bzr.el, vc-dir.el, vc-dispatcher.el, vc-git.el, * vc-hg.el, vc-mtn.el, vc.el: Add keyword "vc".
*	Move version control related files to the "vc" subdirectory.	Juri Linkov	2010-06-11	1	-0/+1231
	* add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el, * ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el, * ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el, * ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el, * pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el, * smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el, * vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el, * vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el: Move files to the "vc" subdirectory.