Mercurial > emacs
view lisp/patcomp.el @ 111679:33ed3cf8260b
Initial support for unified DVCS pull and merge.
* lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars.
(vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull)
(vc-bzr-merge-branch): New functions, implementing merge-branch
and pull operations.
* lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available.
Accept optional prefix arg meaning to prompt for a command.
(vc-update): Use vc-BACKEND-pull if available. Accept optional
prefix arg meaning to prompt for a command.
(vc-pull): Alias for vc-update.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 22 Nov 2010 20:15:08 -0500 |
parents | 1e3a407766b9 |
children | ef719132ddfa |
line wrap: on
line source
;;; patcomp.el --- used by patch files to update Emacs releases -*- no-byte-compile: t -*- ;; This file is part of GNU Emacs. ;;; Commentary: ;;; Code: (defun batch-byte-recompile-emacs () "Recompile the Emacs `lisp' directory. This is used after installing the patches for a new version." (let ((load-path (list (expand-file-name "lisp")))) (byte-recompile-directory "lisp"))) (defun batch-byte-compile-emacs () "Compile new files installed in the Emacs `lisp' directory. This is used after installing the patches for a new version. It uses the command line arguments to specify the files to compile." (let ((load-path (list (expand-file-name "lisp")))) (batch-byte-compile))) ;; arch-tag: cb299b78-1d6c-4c02-945b-12fa2e856d6f ;;; patcomp.el ends here