forks/emacs.git -

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix 2010-11-22 change to diff.el.	Chong Yidong	2010-12-20	1	-10/+2
\| \| \| \| \| \|	* vc/diff.el (diff-better-file-name): Function deleted. abbreviating file names causes problems with shell-quote-argument. (diff-no-select): Just use expand-file-name.
*	diff-sentinel trivia.	Glenn Morris	2010-12-02	1	-2/+1
\| \| \| \| \| \| \|	* lisp/ibuf-ext.el (diff-sentinel): Update declaration. * lisp/ibuffer.el: Regenerate autoloads. * lisp/vc/diff.el (diff-sentinel): Make new arguments optional, eg for the sake of ibuffer-diff-buffer-with-file-1.
*	* diff.el (diff): Fix it for good, hopefully, this time.	Stefan Monnier	2010-11-25	1	-5/+4
\|
*	* lisp/vc/diff.el (diff): Fix last change.	Stefan Monnier	2010-11-24	1	-2/+2
\|
*	Cleanup diff-buffer-with-file.	Stefan Monnier	2010-11-22	1	-52/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* lisp/vc/diff.el (diff-old-temp-file, diff-new-temp-file): Remove. (diff-sentinel): Get them as arguments instead. (diff-old-file, diff-new-file, diff-extra-args): Remove. (diff-file-local-copy, diff-better-file-name): New funs. (diff-no-select): Rename from diff-into-buffer. Support buffers additionally to files. Move `buf' arg. Don't display buf. Prefer closures to buffer-local variables. (diff): Adjust accordingly. (diff-buffer-with-file): Move from files.el. * lisp/files.el (diff-buffer-with-file): Move to vc/diff.el. (diff-buffer-internal): Remove. (diff-buffer-buffer): Remove. (save-some-buffers-action-alist): Use diff-no-select so as not to guess the buffer name used, and so as not to mess up windows and frames.
*	* lisp/files.el: Make revert work with diff-buffer-with-file.	Bob Rogers	2010-11-22	1	-2/+6
\| \| \| \| \| \| \| \| \|	(diff-buffer-internal): New function extracted from diff-buffer-with-file (diff-buffer-with-file): Use it. * lisp/vc/diff.el (diff-into-buffer): New fun, extracted from diff. (diff): Use it. Fixes: debbugs:7277
*	* 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/+205
	* 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.