Mercurial > emacs

view .dir-locals.el @ 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 3655cc4062e4
children
line wrap: on
line source

((nil . ((tab-width . 8)
         (sentence-end-double-space . t)
         (fill-column . 70)))
 (c-mode . ((c-file-style . "GNU")))
 ;; You must set bugtracker_debbugs_url in your bazaar.conf for this to work.
 ;; See admin/notes/bugtracker.
 (log-edit-mode . ((log-edit-rewrite-fixes
                    " (bug#\\([0-9]+\\))" . "debbugs:\\1")))
 (change-log-mode . ((add-log-time-zone-rule . t)
		     (fill-column . 74)
		     (bug-reference-url-format . "http://debbugs.gnu.org/%s")
		     (mode . bug-reference)))
 (diff-mode . ((mode . whitespace))))