Backport fix for 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.

diff --git a/.dir-locals.el b/.dir-locals.el
index 203343f0842c3539a5b9ff2a8437cb943a0ddb74..afc68ea3ba6222aa366fd5fc79a298f86d481c82 100644 (file)
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -3,11 +3,7 @@
          (fill-column . 70)))
  (c-mode . ((c-file-style . "GNU")))
  (objc-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
-                    "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1")
-                   (log-edit-font-lock-gnu-style . t)
+ (log-edit-mode . ((log-edit-font-lock-gnu-style . t)
                    (log-edit-setup-add-author . t)))
  (change-log-mode . ((add-log-time-zone-rule . t)
                     (fill-column . 74)

diff --git a/ChangeLog b/ChangeLog
index b880909c4d8a6c52209cc3ba1c416eeee5684a12..0b0336ead5d2e03d967ba505db186c262b58d704 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Backport fix for minor Bazaar leftovers.
+       * .dir-locals.el: Remove reference to bzr commit --fixes debbugs.
+
 2014-11-13  Eli Zaretskii  <eliz@gnu.org>
 
        * .gitignore: Add more ignorables.

diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE
index 882773bcb5e8e12297d96997ca51449457f93859..d1ee9f4690c0f6d3f058062c9abd8b9960c001ea 100644 (file)
--- a/etc/CONTRIBUTE
+++ b/etc/CONTRIBUTE
@@ -75,7 +75,7 @@ patches) over all your contributions.
 
 * Getting the Source Code
 
-The latest version of Emacs can be downloaded using Bazaar from the
+The latest version of the Emacs source code can be downloaded from the
 Savannah web site.  It is important to write your patch based on the
 latest version.  If you start from an older version, your patch may be
 outdated (so that maintainers will have a hard time applying it), or
@@ -215,4 +215,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[         \f]*$"
 end:
-

diff --git a/etc/ChangeLog b/etc/ChangeLog
index f1bfc5c62c85e43929948996899aa076a1cc4592..851af7f2735062a05caee1fa37e42ed365eb882c 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Backport fix for minor Bazaar leftovers.
+       Reported by Perry E. Metzger in:
+       http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00745.html
+       * CONTRIBUTE: More git transition.
+
 2014-11-11  Eric S. Raymond  <esr@thyrsus.com>
 
        * CONTRIBUTE: git transition.