Mercurial > emacs
annotate .dir-locals.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 | 3655cc4062e4 |
children |
rev | line source |
---|---|
101014 | 1 ((nil . ((tab-width . 8) |
110767
2c36d4f54456
* .dir-locals.el: The Emacs convention is sentence-end-double-space.
Glenn Morris <rgm@gnu.org>
parents:
107432
diff
changeset
|
2 (sentence-end-double-space . t) |
100718
0a3d5993b567
Remove non-working entry for pmail.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100687
diff
changeset
|
3 (fill-column . 70))) |
100672
38e7317321ea
* make-dist (tempdir): Distribute .dir-locals.el.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
4 (c-mode . ((c-file-style . "GNU"))) |
111591
6926686a73a0
Comments related to `bzr commit --fixes'.
Glenn Morris <rgm@gnu.org>
parents:
111387
diff
changeset
|
5 ;; You must set bugtracker_debbugs_url in your bazaar.conf for this to work. |
6926686a73a0
Comments related to `bzr commit --fixes'.
Glenn Morris <rgm@gnu.org>
parents:
111387
diff
changeset
|
6 ;; See admin/notes/bugtracker. |
111387
c781fc4de505
* .dir-locals.el (log-edit-mode): Set log-edit-rewrite-fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106607
diff
changeset
|
7 (log-edit-mode . ((log-edit-rewrite-fixes |
c781fc4de505
* .dir-locals.el (log-edit-mode): Set log-edit-rewrite-fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106607
diff
changeset
|
8 " (bug#\\([0-9]+\\))" . "debbugs:\\1"))) |
100718
0a3d5993b567
Remove non-working entry for pmail.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100687
diff
changeset
|
9 (change-log-mode . ((add-log-time-zone-rule . t) |
101158
4a6ff510dcf9
(change-log-mode): Add bug-reference-url-format and bug-reference-mode.
Juri Linkov <juri@jurta.org>
parents:
101014
diff
changeset
|
10 (fill-column . 74) |
106607
55134161b319
(bug-reference-url-format): Change to debbugs.gnu.org.
Glenn Morris <rgm@gnu.org>
parents:
105015
diff
changeset
|
11 (bug-reference-url-format . "http://debbugs.gnu.org/%s") |
107432
340849d761a5
* .dir-locals.el (c-mode): Turn on whitespace-mode for diff-mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106607
diff
changeset
|
12 (mode . bug-reference))) |
340849d761a5
* .dir-locals.el (c-mode): Turn on whitespace-mode for diff-mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106607
diff
changeset
|
13 (diff-mode . ((mode . whitespace)))) |