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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add 2012 to FSF copyright years for Emacs files	Glenn Morris	2012-01-05	1	-1/+1
\|
*	Capitalize non-function content words in menu item strings.	Juri Linkov	2011-09-18	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* lisp/buff-menu.el (Buffer-menu-mode-map): * lisp/dired.el (dired-mode-map): * lisp/emacs-lisp/lisp-mode.el (emacs-lisp-mode-map) (lisp-interaction-mode-map): * lisp/emacs-lisp/package.el (package-menu-mode-map): * lisp/epa.el (epa-key-list-mode-map): * lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu) (menu-bar-options-menu): * lisp/outline.el (outline-mode-menu-bar-map): * lisp/vc/vc-bzr.el (vc-bzr-shelve-menu-map, vc-bzr-extra-menu-map): * lisp/vc/vc-dir.el (vc-dir-menu-map): * lisp/vc/vc-git.el (vc-git-stash-menu-map, vc-git-extra-menu-map): Capitalize non-function content words in menu item strings. * lisp/dired.el (dired-mode-map): Add menu item for `image-dired-dired-toggle-marked-thumbs'.
*	* lisp/progmodes/compile.el (compilation-start): Let-bind `thisenv' to	Juri Linkov	2011-09-07	1	-2/+2
\| \| \| \| \| \| \| \| \| \|	`compilation-environment'. Set buffer-local `compilation-environment' to `thisenv' later after (funcall mode). (Bug#8340) * lisp/vc/vc-git.el (vc-git-grep): Remove --no-color. (Bug#9408) (vc-git-grep): Prepend "PAGER=" to `compilation-environment' instead of replacing its value. (Bug#8340)
*	* lisp/vc/vc-git.el (vc-git-grep): Use --no-color. (tiny change)	Wilfred Hughes	2011-09-01	1	-1/+2
\| \| \| \|	Fixes: debbugs:9408
*	Add `vc-git-program' option; suggested on emacs-devel.	Glenn Morris	2011-03-10	1	-7/+15
\| \| \| \| \| \|	* lisp/vc/vc-git.el (vc-git-program): New option. (vc-git-branches, vc-git-pull, vc-git-merge-branch, vc-git-command) (vc-git--call): Use it.
*	Add Log View toggle and log format customization for Git and Hg.	Chong Yidong	2011-02-13	1	-33/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* lisp/vc/vc-git.el (vc-git-root-log-format): New option for customizing log format. (vc-git-print-log, vc-git-log-outgoing, vc-git-log-incoming) (vc-git-log-view-mode): Use it. (vc-git-expanded-log-entry): New function. (vc-git-log-view-mode): Use it. Truncate lines in root log. * lisp/vc/vc-hg.el (vc-hg-root-log-template): New option for customizing log format. (vc-hg-print-log): Use it. (vc-hg-expanded-log-entry): New function. (vc-hg-log-view-mode): Use vc-hg-root-log-template and vc-hg-expanded-log-entry. Truncate lines in root log. * lisp/vc/vc-bzr.el (vc-bzr-log-view-mode): Truncate lines in root log. * lisp/vc/log-view.el (log-view-mode-menu): Add log-view-toggle-entry-display.
*	Refresh Dired and VC-dir buffers after vc-pull and vc-merge.	Chong Yidong	2011-01-29	1	-7/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* vc/vc-dispatcher.el (vc-set-async-update): New function for updating Dired or VC-dir buffers after async command completes. * vc/vc-bzr.el (vc-bzr-async-command): Return the process buffer. (vc-bzr-pull, vc-bzr-merge-branch): Use vc-set-async-update. * vc/vc-git.el (vc-git-merge-branch): Add FETCH_HEAD to branch completions if it exists. Use vc-set-async-update. (vc-git-pull): Use vc-set-async-update. * vc/vc-hg.el (vc-hg-pull): Fix default-contents arg to read-shell-command. Use vc-set-async-update. (vc-hg-merge-branch): Use vc-set-async-update.
*	Rudimentary support for vc-pull and vc-merge in Git and Mercurial.	Chong Yidong	2011-01-28	1	-0/+51
\| \| \| \| \| \| \| \| \| \| \| \| \|	* lisp/vc/vc.el (vc-pull): Make vc-update an alias for this, instead of the other way around. * lisp/vc/vc-git.el (vc-git-branches, vc-git-pull) (vc-git-merge-branch): New functions. (vc-git-history): New var. * lisp/vc/vc-hg.el (vc-hg-history): New var. (vc-hg-pull): Perform default pull if called via Lisp by vc-pull. (vc-hg-merge-branch): New function.
*	Convert consecutive FSF copyright years to ranges.	Glenn Morris	2011-01-24	1	-1/+1
\|
*	Nuke arch-tags.	Glenn Morris	2011-01-15	1	-1/+0
\|
*	Merge from emacs-23	Stefan Monnier	2011-01-14	1	-1/+1
\|
*	Add "Package:" file headers to denote built-in packages.	Chong Yidong	2010-08-29	1	-0/+1
\|
*	Merge changes from emacs-23 branch.	Chong Yidong	2010-07-10	1	-11/+19
\|
*	* 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/+1031
	* 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.