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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update copyright year to 2014 by running admin/update-copyright.	Paul Eggert	2014-01-01	1	-1/+1
\|
*	Silence ediff compilation	Glenn Morris	2013-05-23	1	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* lisp/vc/ediff-diff.el, lisp/vc/ediff-merg.el: Require ediff-util at run-time. * lisp/vc/ediff-mult.el: Adjust requires. (ediff-directories-internal, ediff-directory-revisions-internal) (ediff-patch-file-internal): Declare. * lisp/vc/ediff-ptch.el: Adjust requires. (ediff-use-last-dir, ediff-buffers-internal): Declare. (ediff-find-file): Autoload. * lisp/vc/ediff-util.el: No need to load ediff when compiling. (ediff-regions-internal): Declare. * lisp/vc/ediff-wind.el: Adjust requires. (ediff-compute-toolbar-width): Define when compiling. (ediff-setup-control-buffer, ediff-make-bottom-toolbar): Declare. * lisp/vc/ediff.el: No need to load dired, ediff-ptch when compiling. (dired-get-filename, dired-get-marked-files) (ediff-last-dir-patch, ediff-patch-default-directory) (ediff-get-patch-buffer, ediff-dispatch-file-patching-job) (ediff-patch-buffer-internal): Declare.
*	Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca	Paul Eggert	2013-01-02	1	-1/+1
\|\
\| *	Update copyright notices for 2013.	Paul Eggert	2013-01-01	1	-1/+1
\| \|
* \|	* vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'.	Dmitry Antipov	2012-12-20	1	-3/+3
\|/ \| \| \|	Adjust comment.
*	Add 2012 to FSF copyright years for Emacs files	Glenn Morris	2012-01-05	1	-1/+1
\|
*	Spelling fixes.	Paul Eggert	2011-12-14	1	-1/+1
\|
*	Spelling fixes.	Paul Eggert	2011-11-14	1	-1/+1
\|
*	Merge changes from emacs-23 branch	Chong Yidong	2011-02-12	1	-1/+1
\|
*	Refill some long/short copyright headers.	Glenn Morris	2011-01-26	1	-2/+1
\|
*	Convert consecutive FSF copyright years to ranges.	Glenn Morris	2011-01-24	1	-2/+1
\|
*	Refill some copyright headers.	Glenn Morris	2011-01-15	1	-2/+3
\|
*	Merge from emacs-23	Stefan Monnier	2011-01-14	1	-3/+2
\|
*	Remove some tests for defunct system-types.	Glenn Morris	2010-10-08	1	-4/+4
\| \| \| \| \| \| \|	* lisp/vc/ediff-wind.el (ediff-setup-control-frame): * lisp/vc/ediff-ptch.el (ediff-default-backup-extension): * lisp/vc/ediff-diff.el (ediff-shell, ediff-diff-options) (ediff-exec-process): Remove system-types emx, windows-95.
*	Add "Package:" file headers to denote built-in packages.	Chong Yidong	2010-08-29	1	-0/+1
\|
*	Move version control related files to the "vc" subdirectory.	Juri Linkov	2010-06-11	1	-0/+844
	* 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.