Mercurial > emacs

view etc/emacs.py @ 111679:33ed3cf8260b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 69c173eabff4
children bdb3fe0ba9fa ef719132ddfa
line wrap: on
line source

"""Wrapper for version-specific implementations of python.el helper
functions """

import sys

if sys.version_info[0] == 3:
    from emacs3 import *
else:
    from emacs2 import *

# arch-tag: 894b5227-638f-45fd-8567-0417d5c35900