1 files changed, 11 insertions, 3 deletions

diff --git a/.dir-locals.el b/.dir-locals.el
index 68eb58fa18b..96473a7086d 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -2,8 +2,12 @@
          (sentence-end-double-space . t)
          (fill-column . 70)))
  (c-mode . ((c-file-style . "GNU")
-            (c-noise-macro-names . ("UNINIT" "CALLBACK" "ALIGN_STACK"))))
- (objc-mode . ((c-file-style . "GNU")))
+            (c-noise-macro-names . ("UNINIT" "CALLBACK" "ALIGN_STACK"))
+            (electric-quote-comment . nil)
+            (electric-quote-string . nil)))
+ (objc-mode . ((c-file-style . "GNU")
+               (electric-quote-comment . nil)
+               (electric-quote-string . nil)))
  (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)
@@ -11,4 +15,8 @@
                      (bug-reference-url-format . "https://debbugs.gnu.org/%s")
                      (mode . bug-reference)))
  (diff-mode . ((mode . whitespace)))
- (emacs-lisp-mode . ((indent-tabs-mode . nil))))
+ (emacs-lisp-mode . ((indent-tabs-mode . nil)
+                     (electric-quote-comment . nil)
+                     (electric-quote-string . nil)))
+ (texinfo-mode . ((electric-quote-comment . nil)
+                  (electric-quote-string . nil))))