aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-11-13 09:16:33 -0800
committerPaul Eggert2014-11-13 09:17:19 -0800
commit584fa315db2c041f0e05a9d709c3ee03c7f91be2 (patch)
tree63a61623128e1b9ab034c13f5298f930ab46f76b
parent02ee710a0b9c1761ec935aeb0097eb5aa8d311ac (diff)
downloademacs-584fa315db2c041f0e05a9d709c3ee03c7f91be2.tar.gz
emacs-584fa315db2c041f0e05a9d709c3ee03c7f91be2.zip
Fix minor Bazaar leftovers.
Reported by Perry E. Metzger in: http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00745.html * .dir-locals.el: Remove reference to bzr commit --fixes debbugs. * etc/CONTRIBUTE: More git transition.
-rw-r--r--.dir-locals.el6
-rw-r--r--etc/CONTRIBUTE3
-rw-r--r--etc/ChangeLog7
3 files changed, 9 insertions, 7 deletions
diff --git a/.dir-locals.el b/.dir-locals.el
index 203343f0842..afc68ea3ba6 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -3,11 +3,7 @@
3 (fill-column . 70))) 3 (fill-column . 70)))
4 (c-mode . ((c-file-style . "GNU"))) 4 (c-mode . ((c-file-style . "GNU")))
5 (objc-mode . ((c-file-style . "GNU"))) 5 (objc-mode . ((c-file-style . "GNU")))
6 ;; You must set bugtracker_debbugs_url in your bazaar.conf for this to work. 6 (log-edit-mode . ((log-edit-font-lock-gnu-style . t)
7 ;; See admin/notes/bugtracker.
8 (log-edit-mode . ((log-edit-rewrite-fixes
9 "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1")
10 (log-edit-font-lock-gnu-style . t)
11 (log-edit-setup-add-author . t))) 7 (log-edit-setup-add-author . t)))
12 (change-log-mode . ((add-log-time-zone-rule . t) 8 (change-log-mode . ((add-log-time-zone-rule . t)
13 (fill-column . 74) 9 (fill-column . 74)
diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE
index 882773bcb5e..d1ee9f4690c 100644
--- a/etc/CONTRIBUTE
+++ b/etc/CONTRIBUTE
@@ -75,7 +75,7 @@ patches) over all your contributions.
75 75
76* Getting the Source Code 76* Getting the Source Code
77 77
78The latest version of Emacs can be downloaded using Bazaar from the 78The latest version of the Emacs source code can be downloaded from the
79Savannah web site. It is important to write your patch based on the 79Savannah web site. It is important to write your patch based on the
80latest version. If you start from an older version, your patch may be 80latest version. If you start from an older version, your patch may be
81outdated (so that maintainers will have a hard time applying it), or 81outdated (so that maintainers will have a hard time applying it), or
@@ -215,4 +215,3 @@ Local variables:
215mode: outline 215mode: outline
216paragraph-separate: "[ ]*$" 216paragraph-separate: "[ ]*$"
217end: 217end:
218
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 87efd2ac5f8..b3f4afa93a0 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,10 @@
12014-11-13 Paul Eggert <eggert@cs.ucla.edu>
2
3 Fix minor Bazaar leftovers.
4 Reported by Perry E. Metzger in:
5 http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00745.html
6 * CONTRIBUTE: More git transition.
7
12014-11-11 Eric S. Raymond <esr@thyrsus.com> 82014-11-11 Eric S. Raymond <esr@thyrsus.com>
2 9
3 * CONTRIBUTE: git transition. 10 * CONTRIBUTE: git transition.