aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-11-16 19:43:26 -0800
committerPaul Eggert2014-11-16 19:43:46 -0800
commit2e007571951887a94daad3a46ec3380ab83497b4 (patch)
treef73382ceb70767ef28879f4424c14e501023cdee
parent790c69057269dbed855375b91120ccf3cce0f830 (diff)
downloademacs-2e007571951887a94daad3a46ec3380ab83497b4.tar.gz
emacs-2e007571951887a94daad3a46ec3380ab83497b4.zip
Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode.
* .dir-locals.el (log-edit-mode): Restore the (log-edit-rewrite-fixes "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1"). See Glenn Morris in: http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01187.html
-rw-r--r--.dir-locals.el4
-rw-r--r--ChangeLog5
2 files changed, 8 insertions, 1 deletions
diff --git a/.dir-locals.el b/.dir-locals.el
index afc68ea3ba6..5e73e0d9acd 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -3,7 +3,9 @@
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 (log-edit-mode . ((log-edit-font-lock-gnu-style . t) 6 (log-edit-mode . ((log-edit-rewrite-fixes
7 "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1")
8 (log-edit-font-lock-gnu-style . t)
7 (log-edit-setup-add-author . t))) 9 (log-edit-setup-add-author . t)))
8 (change-log-mode . ((add-log-time-zone-rule . t) 10 (change-log-mode . ((add-log-time-zone-rule . t)
9 (fill-column . 74) 11 (fill-column . 74)
diff --git a/ChangeLog b/ChangeLog
index c9ea640b588..239b5efd6be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
12014-11-17 Paul Eggert <eggert@cs.ucla.edu> 12014-11-17 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode.
4 * .dir-locals.el (log-edit-mode): Restore the (log-edit-rewrite-fixes
5 "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1"). See Glenn Morris in:
6 http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01187.html
7
3 Simplify and fix doc-related .gitignore files. 8 Simplify and fix doc-related .gitignore files.
4 This fixes some unwanted 'git status' output after 'make docs'. 9 This fixes some unwanted 'git status' output after 'make docs'.
5 * .gitignore: Add **/Makefile, **/makefile. 10 * .gitignore: Add **/Makefile, **/makefile.