[elpa] elpa-admin c1025dad3c 2/2: Merge branch 'elpa-admin' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa into elpa-admin

[Stefan Monnier]

branch: elpa-admin
commit c1025dad3c1f06098be6e7b3f11322cf11e56514
Merge: 500f66b16f 3ec53b8df7
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    Merge branch 'elpa-admin' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa 
into elpa-admin
---
 .dir-locals.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.dir-locals.el b/.dir-locals.el
index f6353a9a44..0c458870cd 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -3,10 +3,13 @@
 
 ((nil . ((tab-width . 8)
          (sentence-end-double-space . t)
+         (emacs-lisp-docstring-fill-column . 65)
          (fill-column . 70)
+         (vc-git-annotate-switches . "-w")
          (bug-reference-url-format . "https://debbugs.gnu.org/%s";)))
  (log-edit-mode . ((log-edit-font-lock-gnu-style . t)
-                   (log-edit-setup-add-author . t)))
+                   (log-edit-setup-add-author . t)
+                   (vc-git-log-edit-summary-target-len . 50)))
  (change-log-mode . ((add-log-time-zone-rule . t)
                      (fill-column . 74)
                      (mode . bug-reference)))
@@ -14,4 +17,5 @@
  (emacs-lisp-mode . ((indent-tabs-mode . nil)
                      (electric-quote-comment . nil)
                      (electric-quote-string . nil)
-                     (mode . bug-reference-prog))))
+                     (mode . bug-reference-prog)))
+ (lisp-data-mode . ((indent-tabs-mode . nil))))