forks/emacs.git -

	Commit message (Expand)	Author	Age	Files	Lines
*	Update copyright year to 2014 by running admin/update-copyright.	Paul Eggert	2014-01-01	1	-1/+1
*	* lisp/vc/smerge-mode.el (smerge-ediff): Choose default buffer names based	David Kastrup	2013-11-25	1	-6/+23
*	* lisp/vc/smerge-mode.el: Remove redundant :group args.	Stefan Monnier	2013-08-28	1	-16/+5
*	Update copyright notices for 2013.	Paul Eggert	2013-01-01	1	-1/+1
*	* lisp/facemenu.el (list-colors-sort): Add option "Luminance".	Juri Linkov	2012-09-30	1	-1/+1
*	Replace version 24.2 with 24.3 where appropriate (hopefully)	Glenn Morris	2012-08-15	1	-2/+2
*	Reduce use of (require 'cl).	Stefan Monnier	2012-07-10	1	-9/+9
*	Use the same diff color scheme as in modern VCSes (bug#10181).	Juri Linkov	2012-05-25	1	-26/+75
*	Add new error and function `user-error'.	Stefan Monnier	2012-05-04	1	-6/+3
*	Minor-mode doc fixes for ARG behavior	Glenn Morris	2012-02-07	1	-0/+3
*	Add 2012 to FSF copyright years for Emacs files	Glenn Morris	2012-01-05	1	-1/+1
*	Silence warning for unused `dotimes' counter variables.	Juanma Barranquero	2011-06-02	1	-3/+3
*	* lisp/vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark.	Stefan Monnier	2011-05-23	1	-0/+1
*	Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.	Glenn Morris	2011-05-12	1	-2/+2
*	Misc fixes, and use lexical-binding in more files.	Stefan Monnier	2011-03-11	1	-1/+1
*	Convert consecutive FSF copyright years to ranges.	Glenn Morris	2011-01-24	1	-2/+1
*	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
*	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
*	* lisp/finder.el (finder-known-keywords): Add keyword "vc"	Juri Linkov	2010-06-11	1	-1/+1
*	Move version control related files to the "vc" subdirectory.	Juri Linkov	2010-06-11	1	-0/+1231